added loop to display friends
fixed merge error in index.html.haml
Merge pull request #28 from belindahare/master

added loop to display current user's friends
.
.
added :authenticate_user! as a before action to the welcome controller
Merge pull request #29 from bjlinville1/master

user auth as before action
added comment to user.rb, added user_params to welcome_controller, added a migration to create a column for workflow for the Users tabel
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
modals
pull upstream
pulled in log-in