Finishes chapter 6
Finishes chapter 4 and 5
Fixes indentation in 4,5
Merge branch 'master' of https://github.com/Styren/ORKA