updating gitignore
basic dialog
Merge branch 'master' of https://github.com/mpieler/booglers into michelle
start of mapsAPI
mods for google play services
Merge branch 'master' of https://github.com/mpieler/booglers into michelle

Conflicts:
	app/build.gradle
	app/src/main/AndroidManifest.xml
taking pictures from new candy button
merge
saves picture with latitude and longitude coordinates
comma in lat long coordinates replaced with underscore
maps API partial
Merge branch 'michelle'

Conflicts:
	.idea/misc.xml
	app/app.iml
	app/src/main/AndroidManifest.xml
	app/src/main/java/booglers/candyrush/mainActivity.java
	app/src/main/res/layout/activity_main.xml
	app/src/main/res/values/strings.xml
merge
moving new candy to the action bar
activities for drive