Max of three points on map added
Merge branch 'tims'
Merge branch 'master' of https://github.com/westjour/CodeMichApp

Resolved Conflicts:

MyApplication/app/src/main/java/com/example/jourdan/myapplication/StatsA
ctivity.java
Merge branch 'master' into tims
Upgraded home screen
Merge branch 'tims'
Merge branch 'master' of https://github.com/westjour/CodeMichApp