Tiddy up
Merge branch 'master' of https://github.com/cachibache/boris-bikes

Conflicts:
	classes/control.rb