Team-Sisyphus/Sisyphus — pull request #1 by DocSohl (2012-10-26 17:01:37+00:00)
Title: Character controller

Merge Controller back into master.