edits
Merge pull request #32 from chicagocamps/master

edits