AndyBarron/CivilWar2014 — pull request #4 by AndyBarron (2014-09-09 20:19:23+00:00)
Title: Merge End-Semester Expo changes into master

So we can start hacking away again during the Fall 2014 semester :-)