Second edit
deleted files
Merge branch 'master' of https://github.com/axchang/axchang.github.io

Conflicts:
	stylesheet.css