update front page
Merge branch 'master' of https://github.com/jsstrn/rentmyride

Conflicts:
	app/View/Users/login.ctp