Edits
Merge pull request #1 from chrissnyder/2014

Edits