Fixed links not linking.
Added new map files - may not be complete(I don't know)
Uncommented town
Merge branch 'master' of https://github.com/leesdolphin/DECO1800

Conflicts:
	town.php