First commit
Merge branch 'master' of https://github.com/samdoyon/tmnfall2013