Added Stuff.
Merge branch 'master' of github.com:leesdolphin/DECO1800

Conflicts:
	css/town.css
	js/town_db.js
	js/town_db_picture.js
	js/town_year.js