Refactored competitions
Deleted css
Deleted css
Merge origin/master

Conflicts:
	www/style/app.css