filled in AM
Merge branch 'master' of https://github.com/nicole28/CMSC345.04-TheAviators

Conflicts:
	src/modifyLocation.php