Merge pull request #29 from bjlinville1/master

user auth as before action
Merge pull request #30 from bjlinville1/master

You will need to run a rake db:migrate
commiting so I can pull down styles
changes to welcome controller
put ben's whitelisting back in welcome controller
Merge pull request #31 from belindahare/master

removed redundant code from welcome controller
added a welcome show view, added a show method to the welcome controller, changed our root route to the welcome show route