Merge branch 'master' of https://github.com/rlove1221/Bedazzle