detect user current GPS location
Merge branch 'master' of https://github.com/westjour/CodeMichApp into jourdans

Conflicts:
	MyApplication/app/src/main/java/com/example/jourdan/myapplication/MapActivity.java
resolve conflicts
Merge pull request #3 from westjour/jourdans

detect user current GPS location