working on the map again

starting to wonder if the emulator doesn't have google play? I think
I've done everything right, so...
giving up on the map for now lol

not working! don't know why!
working on the camera

sighhh keeps breaking
Merge branch 'part3'

Conflicts:
	ass2/.idea/workspace.xml