ignoring my darkest secrets
Merge branch 'master' of github.com:beefchimi/gulp-config

Conflicts:
	secrets.json