Merge pull request #73 from mreist/Jay

Fixed Model Stuff
Merge remote-tracking branch 'origin/master' into Nick's-Branch
Merge branch 'Nick's-Branch' of https://github.com/mreist/Team-Titan into Nick's-Branch