Build a world
Merge remote-tracking branch 'origin/master' into css-perspective

Conflicts:
	css/theme.css
	js/script.coffee
	js/script.js
	sass/theme.sass
Better implementation