to pull
to pull
commit
Merge branch 'master' of git@github.com:huypham612/cse131_winter14.git
solve conflict
Merge branch 'master' of git@github.com:huypham612/cse131_winter14.git

Conflicts:
	testcases/phase3/check20/typecastConstantFolding.rc
Not "!"  bug