Merge branch 'master' of github.com:kbk9704/cs444

Conflicts:
	ttt.txt
add test on master1