TRex22/RapidGame — pull request #25 by TRex22 (2014-01-25 16:39:03+00:00)
Title: Update develop with latest code

Small repair. I kind of broke the branching model