edits
Merge pull request #36 from chicagocamps/master

edits