another new version
Merge branch 'master' of https://github.com/yansun0/PersonalWebsite

Conflicts:
	details/sample.txt