Developing associations
local merge with master
accidentally deleted some files, replaced them
added associations
changed some accessible
added validations, removed accessible content
fixed user to protect mass-assignment
protected password digest from mass assignment
Merge pull request #2 from zachmokahn/associations

This looks good to me.

One thing to note is that requiring bcrypt and including bcrypt in the user model isn't necessary.