brought back user tests, but commented them out until we better understand Devise
created account model with basic tests
merged conflicts
edited user test
merged conflicts
conflicts merged
Merge pull request #14 from nickpassarella/master

Added account model and brought back user tests (commented out for now)