Map

this wont work to another pc because of the key
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/libraries/play_services_5_2_08.xml
	app/app.iml
	app/build.gradle