adding changes to gitignore
Merge branch 'master' into heroku_deployment
Merge branch 'master' into heroku_deployment
to test geolocation on mobile devices
addressed merge conflict on gitignore