mushroomA
Merge branch 'mirror' of https://github.com/chunwei/gitdemo.git into
mirror

Conflicts:
	gitdemo/src/nc/mairo/Mushroom.java