index file and make file
Merge branch 'sailxjx'

Conflicts:
	package.json