just a bit more now :)
Merge branch 'master' of https://github.com/Schylock/cs111