commits

Conflicts:

	MyApplication/app/src/main/java/com/example/jourdan/myapplication/MapActivity.java