true/false -> 1/0 fix
Merge branch 'master' of https://github.com/michboon/comp2014
Merge branch 'master' of https://github.com/michboon/comp2014