Merge pull request #51 from mreist/master

MERGEEEEEEEEEEEEE
Merge remote-tracking branch 'origin/master' into Jay
Merge remote-tracking branch 'origin/Jay'
Merge branch 'master' of https://github.com/mreist/Team-Titan