Fetched/merged remote repository into local branch.
(re)Fixed bug in Invoice class. Cost is not a property, it is derived
from the invoice's lineitems.
Commiting merge conflicts