Simba-merge fix commit
Merge branch 'master' of https://github.com/theorclord/GameDesignProject2014