updated readme with warning to potential users
fix merge

Merge remote-tracking branch 'upstream/master'

Conflicts:
	README.md
Merge pull request #1 from ncarchedi/master

made some updates to readme