Revert "Aadq67/sprint4"
Merge pull request #38 from karrde00/revert-36-aadq67/sprint4

Revert "Aadq67/sprint4"