Start Again
Merge branch 'master' of https://github.com/elijah123467/UscUpstateApp.git

Conflicts:
	USC Upstate App/bin/classes/com/softenginclass/usc/upstate/app/map/OurMap.class
Some changes
Here is the new stuff not quite working yet but uts a start with the new map api