dwfewfewfewhufew:x
Merge branch 'master' of https://github.com/RasmusRK/Project

Conflicts:
	web/new_project.php
Merge branch 'master' of https://github.com/RasmusRK/Project
Merge branch 'master' of https://github.com/RasmusRK/Project
changed loggin with email to id