update

update
Merge branch 'master' of https://github.com/zhaoxun321/Assignment3

Conflicts:
	bin/.gitignore