ignore file update
Merge branch 'master' of github.com:ShireJiang/home-page

Conflicts:
	public/.DS_Store