MASSIVE update
Merge branch 'master' of https://github.com/theKGS/conprog-1

I hate this and I want it to die.