testing
test
Merge branch 'master' of https://github.com/bhalothia/sri

Conflicts:
	.gitignore
	README.md
'e'