skeleton for model tests completed
working on user model test
nixon needs to update his file
fixed merged conflicts
Merge pull request #6 from simensta/model-tests

fixed merge conflicts