Jay/Anthony - Finished Spiking Time and now building Time via TDD
Added outter wall offset

Made larger print out of time in 'sprint'
Merge remote-tracking branch 'origin/master' into time_function
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
Final conflict fixes for branch
Merge pull request #2 from cjboo/master

Randomly generate fruit on the board
Rohan/Anthony - Refactored outwall tests to be more readable
Info on sprites
Merge branch 'master' of github.com:twlevelup/syd-levelup-2-red-team
Merge https://github.com/twlevelup/syd-levelup-2-red-team
L+S Fruits disappear when player collides with it.
L+S Fruits disappear after player collides with it.
Merge branch 'master' of https://github.com/twlevelup/syd-levelup-2-red-team

Conflicts:
	main.lua
Jay - Pushed global variables to `Presets.lua`

Updated missing Time fixes. Moved existing global variables to Presets.
Remember to declare `require 'presets'`. Also updated game name to
_"Fruit Harvest"_
Jay - added new fruit and graphics with scores

Updated graphics to Pete's (non 8-bit) set: apple, orange, banana.
Random flavour chosen if none given. Completed test (except for 'should
have unique scores per fruit type'). No golden pineapple yet. Note
scores are test values (not the ones specified in user stories)
Refactoring the random fruit placeing
Merge branch 'master' of https://github.com/twlevelup/syd-levelup-2-red-team