cool cursor
Merge branch 'master' of https://github.com/sebastianquack/city54

Conflicts:
	public/stylesheets/style.css