fixed user model test
Merge branch 'master' of github.com:bwinterling/fourthmeal
fixed user model test
Merge branch 'master' into admin
Removed active admin tables and files
fixed error with Devise migration
Fixed schema conflict
Merge pull request #14 from bwinterling/admin

Admin