adding markers to map but crashes
trying to add marker
added key, fixed inital map location
adding dialogues on click of marker on map
trying to add picture taken to dialogue
Image shows up!!
marker icon a pumpkin

Conflicts:
	app/src/main/res/drawable-mdpi/booghost.png
	app/src/main/res/drawable-mdpi/candyicons.png
	app/src/main/res/drawable-mdpi/lollypop.png
	app/src/main/res/drawable-mdpi/pumpkin.png
making white background transparent on pumpkin
customize dialog
Merge branch 'master' of https://github.com/mpieler/booglers into michelle
zoom on location on create
adding 3 dummy points
updating logo
added dummy data
Merge branch 'dummy_data' of https://github.com/mpieler/booglers into dummy_data
fixed bug in drive push
merge and bug fix