rit-sse/rapdev12 — pull request #24 by weswigham (2012-12-03 00:22:55+00:00)
Title: Test merge

Lots of stuff to be merged back down into master, client, server, simulation, artwork, everything, all pre-merged to be merged into the master branch.