add
Merge branch 'master' of github.com:xiuzhaoyang/hack

Conflicts:
	.DS_Store