The queue of hackzors is nigh
Merge branch 'master' of https://github.com/kchq/CodeDay
temp queue and battle zone stuff
Merge branch 'master' of https://github.com/kchq/CodeDay
Updates opponant code!!
Merge branch 'master' of https://github.com/kchq/CodeDay

Conflicts:
	django_dev/CodeCombat/templates/battle.html
Merge branch 'master' of https://github.com/kchq/CodeDay