merge up readme and update it
Merge branch 'master' into golden_master
Merge branch 'golden_master' into solution

Conflicts:
	README.md