Added user migration, model, and barebones controller
Fixed bcrypt version error
Added annotate and rspec
merged users
Added annotation for users
Merge branch 'master' into submit_link_branch
add crush instance methods for calculating up-votes, down-votes, and aggregate-votes
we're a little silly - modified aggregate method for crush