add photo to user
add group merges to branch
Merge branch 'master' into venkman
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