#1 Initial commit
#1 Updated package.json
#1 Merge branch 'develop'

Conflicts:
	package.json