edits
Merge pull request #6 from chicagocamps/master

edits