Add User Model
Add Model test for Preference
modified files
Pass Model test for Preference model
clean temp files & solve merge conflicts
Merge pull request #13 from banana-slugs-2014/preferences

Preferences