removed junk
xMerge branch 'stanzheng' of github.com:stanzheng/cs595-f13 into stanzheng