Merge pull request #1 from westjour/jourdans

Jourdans
app.iml changed itself
Merge branch 'master' of https://github.com/westjour/CodeMichApp

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Resolved conflicts
Merge branch 'master' of https://github.com/westjour/CodeMichApp into jourdans

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