The log in errors are now sepparet
Merge branch 'master' of https://github.com/Sebasdc/LunchTime

Conflicts:
	app/controllers/UserController.php