ace fix 2
file was erased with git. readding it
ace editor theme to work on server now.
merge
stuff
Merge branch 'master' of https://github.com/d601/KodeKonkurrenz

Conflicts:
	app/assets/stylesheets/competition.css.scss
?
haaaaaands
merge from aaron
problems added to competition page