some more updates
Merge branch 'master' of https://github.com/YasserZhang/datasciencecoursera

Conflicts:
	getting_and_cleaning_data/xml_practice.R
finally fix merge conflict