Added all the changes since Monday
Merge branch 'master' of https://github.com/pccsei15/ninja