Updated 11/25/2014

9 files to commit
Merge pull request #3 from BadAssWalrus/master

Updated 11/25/2014