cloning again
Merge branch 'master' of github.com:ecasilla/Moolah into paris
welcome#index controller and view
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
Merge pull request #11 from ecasilla/paris

welcome index page, view and controller