my changes
Merge branch 'master' of https://github.com/dc199082/dc199082.github.io

Conflicts:
	index.html