changed package.json
Merge branch 'master' of https://github.com/snapcat/snapcat

Conflicts:
	package.json