Delete unit.js
Merge branch 'master' of github.com:TacticalDan/FiestyFruits

Conflicts:
	js/Unit.js
	js/Unit.js~
Merge branch 'master' of github.com:TacticalDan/FiestyFruits
Add an initial game loop
Create and transport unit object
Merge branch 'master' of github.com:TacticalDan/FiestyFruits

Conflicts:
	js/Unit.js
Merge branch 'master' of github.com:TacticalDan/FiestyFruits
Merge branch 'master' of github.com:TacticalDan/FiestyFruits

Conflicts:
	app.js