test

te
Merge branch 'master' of https://github.com/Lirick/Hitchhiker

Conflicts:
	foodbook/app/Controller/AppController.php
Ajax login function is done.
Merge branch 'master' of https://github.com/Lirick/Hitchhiker