Seventh Commit
Merge branch 'master' of https://github.com/csc456fall2014/trent-wilson