Initial merged commmit
Merge branch 'master' of github.com:rtheunissen/KPSmart-Team-4