Merge pull request #1 from fiddler-crabs-2014/master

Putting it all together
Putting everyone's work together
Merge pull request #38 from JohnathanWeisner/PuttingItAllTogether

Putting it all together