Finally got MapController to work
Merge branch 'master' of github.com:cameronmccord2/cs340

Conflicts:
	java/src/client/models/IFacade.java