Wrote migration to add User table
Added User class
Wrote unit tests (Shoulda-matchers) for User class
required User model in app.rb
Merge branch 'spike-search' of https://github.com/gopher-snakes-2013/dim_sum_msg_board

Merging spike-users with spike-search
Merge branch 'spike-search' of https://github.com/gopher-snakes-2013/dim_sum_msg_board into spike-search

I dunno
updated discussions and posts to include user_id
added username and password validation to new discussion
Added password validation using bcrypt
added username of each discussion to index
MERGE CONFLICT RESOLVED