fixed merge errors
Merge branch 'master' of github.com:bennettl/protect-your-jewels

# By Brian
# Via Brian
* 'master' of github.com:bennettl/protect-your-jewels:
  merging
  pulling