ss
666
777
Merge branch 'master' of https://github.com/fenixwu/homework

Conflicts:
	angularjs/test3.txt