Dood im so faded
Merge branch 'master' of https://github.com/Its-a-Trap/My-Face-Android

Conflicts:
	ItsATrap/app/src/main/java/com/example/itsatrap/app/MapActivity.java
	TODO.txt