Add hire and return functionality
Merge branch 'master' of https://github.com/arod1987/sample_app