cleaning up
Merge branch 'master' of https://github.com/cliisberg/cpp-stuff