testing
Merge branch 'master' of https://github.com/huypham612/cse131_winter14

Conflicts:
	testcases2/phase2/check2/floatPrePost.rc