Committing to complete issue 10 in Git
Committing the changes made in routes.php
Committing the model for issue 10
Merge branch 'master' into issue10_new

Conflicts:
	app/Controller/BooksController.php
	app/Controller/UsersController.php
	app/Model/Bet.php
	app/Model/User.php
	app/View/Layouts/default.ctp
Merge branch 'issue10_new'