My first commit
Merge branch 'master' of https://github.com/dirkhermans/projectdemo-qcon

getting this to make first commit to repo work