Master change after install
  Please Please Please Please work
hid your file hide your commits hid your dirs people be tryin to push all their crap
Merge branch 'master' of github.com:macewanCMPT395/Team2
Merge branch 'master' of github.com:macewanCMPT395/Team2
Merge branch 'develop'

Conflicts:
	.htaccess
	TESTPUSH.txt
Merge branch 'master' of github.com:macewanCMPT395/Team2
Changes for new branch
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
Michael: fixed internal error, fixed all known problems with main map
	 for cluttering and fixed report list adding to sql query
Merge branch 'develop' of github.com:macewanCMPT395/Team2 into develop

Conflicts:
	application/controllers/json.php
	application/models/incident.php