Initial commit
Create README.md
Merge branch 'master' of https://github.com/icechen1/website-and-resume

Conflicts:
	resume
Merge remote-tracking branch 'origin/master'