misc
Merge branch 'master' of https://github.com/tracksun/sonntagsbox

Conflicts:
	source/javascripts/pixel.coffee
added comment:wq