code is working, no merge errors, no routing errors
Merge pull request #25 from belindahare/master

code is working, no merge errors, no routing errors
merge belindas awesome push
Merge pull request #26 from lizkline91/master

ajax.. we don't have to use it if you guys don't want to.
Merge branch 'master' of github.com:TIY-Q3-ROR-CHS/Team3
style views and template
added image to images dir
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
added workflow_state to display on the index.html.haml, add workflow to friendships.rb, added a migration to create workflow on friendships controller