Michael: fixed Internal Error, had to remove merge lines from .htaccess,
	 added code from earlier today for main map (still doesnt work
	 completely right)
Merge branch 'master' of github.com:macewanCMPT395/Team2