more edits
Merge branch 'develop' of github.com:ajency/BenSmiley into develop