finish
Merge branch 'master' of github.com:dominikwille/comp