finished project 3
Merge branch 'master' of github.com:richardluong/tsinghua-combinatorics

Conflicts:
	project1/project1/example/kid.jpg
	project1/project1/example/landscape.jpg
	project1/project1/example/pic.jpg
	project1/project1/time.sh