Merge branch 'master' of https://github.com/YangDan/Rookie-Components

Conflicts:
	README.md