john was here
Merge branch 'master' of github.com:scottdavis99/lsi

Conflicts:
	README.md
Merge branch 'master' of github.com:scottdavis99/lsi