2014-11-02
Merge branch 'master' of github.com:pj10182014/laravel-git-test

Conflicts:
	app/routes.php