Merging branches for joshua.

-Steven
Merge branch 'master' of https://github.com/Alchai/TimeSaga