readme changes
Merge branch 'master' into 313_init

Conflicts:
	README.md