Fixing conflict
Merge branch 'master' of github.com:mhogenso/Zuse