Merge branch 'master' of github.com:morganwildermuth/skincare into staging
removed one stupid file
Merge branch 'staging' of github.com:morganwildermuth/skincare