add photo to user
add group merges to branch
Merge branch 'master' into venkman
Merge pull request #62 from blind-squirrel/alex

Alex
Tentative php file for business logic
edit contollers and add changes from Alex
Merge branch 'master' into venkman
edit SetupContoller & goals blade to show financial data
Merge pull request #63 from blind-squirrel/venkman

Venkman
Mass commit
Merge branch 'master' of github.com:blind-squirrel/blind-squirrel

Conflicts:
	app/controllers/SetupController.php
	app/routes.php
Login now redirect you to dashboard