Ghetto battle page exists now
Merge branch 'master' of https://github.com/kchq/CodeDay
Update to login form for legit login's 'n stuff
SOLUTION TESTING!! HELL YEA! (cred to jerry for all the testing code)
Merge branch 'master' of https://github.com/kchq/CodeDay

Conflicts:
	data/notional.db
	django_dev/CodeCombat/templates/index.html
Merge branch 'master' of https://github.com/kchq/CodeDay