More grammar stuff and stuff
Merge branch 'master' of https://github.com/mreist/Team-Titan
Merge pull request #128 from mreist/master

Getting Master