Finish timer system with spec

Note: main needs to be merged with master branch
Fixed merge of outer wall spec from master
Fixed some conflicts
Merge branch 'time_function' of https://github.com/twlevelup/syd-levelup-2-red-team into time_function

Conflicts:
	main.lua
	spec/time_spec.lua