table fancy
Merge branch 'master' of https://github.com/kchq/CodeDay

Conflicts:
	django_dev/CodeCombat/static/styles.css