refactor hell
merge
Merge branch 'master' of http://github.com/markthor/RentIt
Merge branch 'master' of http://github.com/markthor/RentIt
merge
merge