rules
Merge branch 'master' of https://github.com/agrigoroi/UniHack

Conflicts:
	app/controllers/Application.java
	conf/routes
Merge branch 'master' of https://github.com/agrigoroi/UniHack
header fixed
Merge branch 'master' of https://github.com/agrigoroi/UniHack