quant edit i edit too

same time edit
Merge branch 'master' of https://github.com/IATeam/Monkeys

Conflicts:
	test.java