I lied

Learn you some history
Merge branch 'dev' of https://github.com/AndyBarron/CivilWar2014 into dev

Conflicts:
	js/screens_test.js