First Commit
Merge branch 'master' of https://github.com/zhangfan2012fall/take_a_taste

Conflicts:
	README.md
Init Github Commit
Merge branch 'master' of https://github.com/zhangfan2012fall/take_a_taste

Conflicts:
	README.md