Merge branch 'master' into Sharon
Merge branch 'master' into Sharon
preparing to start new dashboard
Merge branch 'master' into Sharon
Started on home page tabs
Merge branch 'master' into barryn
Merge branch 'master' into Sharon

Conflicts:
	app/views/dashboard/index.blade.php
Created budget.blade and added Howdy. Added tabs and text for index.blade. Created goals.blade.
Merge pull request #72 from blind-squirrel/alex

Alex
Merge branch 'master' into barryn

Conflicts:
	app/views/dashboard/budget.blade.php
Merge branch 'master' into barryn
change to user app
Merge branch 'master' into Sharon

Conflicts:
	app/models/User.php
all security fixed
Merge pull request #73 from blind-squirrel/Sharon

Sharon
need to update user edit page
create math controller
Merge branch 'master' into Sharon
Add new master code to branch
Merge branch 'master' into venkman
Added text and images to dashboard image.blade.php