merged with login_and_sign_up
added logic for requesting and approving friends
added helper methods and completed controllers for CRUD
finished user views
fixed it
Merge pull request #6 from zachmokahn/users_views

Users views
Added item table, model, and tests
Added AJAX for editing user profile and modified users_controller
Merge pull request #7 from zachmokahn/statuses

Added item table, model, and tests
Merge pull request #8 from zachmokahn/AJAX_micro_challenge

Added AJAX for editing user profile and modified users_controller
Added helpers and seeds to enable future integration testing
Added integration test for logging in as a user.
Added integration test for signing in as a user.
Merge pull request #9 from zachmokahn/user_integration_tests

User integration tests -- committed and reviewed as a group.
added styling to the status field in the user homepage
added status model, controller, etc.
changed users controller, model and views
miscellaneous - deleted rails hp, seeds file, db schema, added resources to config file