find and replace plusses and stars
Merge branch 'master' of https://github.com/Project-Props/Props
merge conflict handled