change a lot
fixed merge
Merge branch 'master' of https://github.com/M1812M/Inf-PP.git

Conflicts:
	IceAge-0.2.4/bug_tree.iag