Initial commit
Merge branch 'master' of https://github.com/mschmutz/bfh-prog2.git
Merge branch 'master' of https://github.com/mschmutz/bfh-prog2