added tests
added tests and fixed conflicts
Merge branch 'master' of github.com:markthor/RentIt