competition page init, page layout ok
Merge branch 'master' of https://github.com/d601/KodeKonkurrenz into aaron

Conflicts:
	config/routes.rb
	db/schema.rb
FUCK GIT, added my route to config routes.rb
Merge branch 'aaron'

Conflicts:
	config/routes.rb