Replace master branch with page content via GitHub
Merge branch 'master' of https://github.com/condy0919/condy0919.github.com into gh-pages

Conflicts:
	index.html