Info Testing
Merge branch 'master' of https://github.com/chris19891128/EECS394

Conflicts:
	js/map.js