updated README
Merge branch 'develop'

Conflicts:
	README.md
updated README
Merge branch 'master' into develop
removes old files automatically