Implemented calculateEndDate
Merge branches 'TestModel' and 'TestModel' of github.com:faern/book-a-hobbit into TestModel