Add tests for other Record validation paths
Rebasing to new master
Add User Model
Add Model test for Preference
modified files
Pass Model test for Preference model
clean temp files & solve merge conflicts
Add tests for other Record validation paths
rebasing master
Merge branch 'Record-Model' of https://github.com/banana-slugs-2014/GlucoseAmigo into Record-Model
Update record_spec.rb
Remove spec_helper from the Factories
Merge pull request #15 from banana-slugs-2014/Record-Model

Add tests for other Record validation paths