all tests passing
Merge pull request #3 from matt-west/master

Fixed bug with status owner names
fixed status controller update issue
changed error in status controller
established user friendship relationship
fixed views/layouts/app.html.erb
fixed issue in routes.rb
fixed styling on nav bar
made integration tests for friendships
added state machine and mailer to app
added acceptance email
create two user friendships test
set up the state machine pt 1
added factory girl gem
added some factories
9 min mark
11 min mark
created user_friendship index page
finally finished test factory module
accepting friendships ptI