ss
Merge branch 'master' of https://github.com/yunxao/startup-hw1

Conflicts:
	part2.js
	prime.txt