Vote
Nice
Merge branch 'master' of https://github.com/dorianDock/agile

Conflicts:
	model/User.php
Merge branch 'master' of https://github.com/dorianDock/agile

Conflicts:
	index.php