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

Conflicts:
	app/assets/stylesheets/competition.css.scss
?
haaaaaands
adding problem id
merge from aaron
problems added to competition page
profile page added. Works with gravitar now. Saving changed user attributes still doesn't work.
modify show to only have email and ranking
practice page route adjusted. CSS for admin forems. Email now displayed for forems.
remove practice page from pages view
adding lose conditions
Merge branch 'master' of https://github.com/d601/KodeKonkurrenz into aaron
add joinTime to games table. Init when game is joined
Merge branch 'master' of https://github.com/d601/KodeKonkurrenz into aaron
format joinTime