new para
Merge branch 'master' of https://github.com/uksinha/sampleApplication

Conflicts:
	index.html