changes to template file re added
Merge branch 'master' of github.com:TobiasWooldridge/FlindersTimetable

Conflicts:
	src/app/timetable/views/booking.tpl.html
Merged file (whitespace changes?) - the Hairy One