added assignment 4
g	Merge branch 'stanzheng' of github.com:stanzheng/cs595-f13 into stanzheng