????
Merge branch 'sub-branch-Grace' of https://github.com/Maiteh/php_project into sub-branch-Grace

Conflicts:
	classes/DB.class.php
	classes/User.class.php
	login.php
	register.php
	sql databank/justintime_2014-05-10.sql