Fixing Master
Merge remote-tracking branch 'origin/Nick's-Branch'
Merge branch 'master' of https://github.com/mreist/Team-Titan