chore(stuff): stuff..
Merge remote-tracking branch 'origin/master'

Conflicts:
	package.json
fix(path): fix path to json