fixed yml
Merge branch 'master' of https://github.com/ecasilla/Moolah
added goals_users join table for many-to-many logic
routes defined
changes to welcome page
fixed brad's merge
fixed stuff
Merge branch 'master' of github.com:ecasilla/Moolah
Merge branch 'master' into paris
edit config/routes for merge conflicts
fixed routes