stuff
Merge branch 'master' of https://github.com/d601/KodeKonkurrenz

Conflicts:
	app/assets/stylesheets/competition.css.scss
?
haaaaaands