Bug fixes plus defence revert to original
Merge branch 'master' of https://github.com/newmanne/CTF-
Fixed flag getters