feature main
del in feature
add index
del in feature
add index
Merge branch 'newBranch' of ssh://git@github.com/Opiant/opientTest.git
into newBranch

Conflicts:
	server/app.js