added timer, added surfboard
re-add control.js???
merge
Merge branch 'frontend' of https://github.com/ben-eath/the-surf-ace into frontend

Conflicts:
	frontend/app/class/control.js