First commit
Merge branch 'master' of https://github.com/kinaesthesia/K-contest

Conflicts:
	knauf-contest-frontend/knauf-contest-frontend.iml