Merge branch 'master' of github.com:giorgiabosello/google-maps-react-markers

Author: giorgiabosello