Periodical: Win 7
Merge github.com:iwabuchiken/FM

Conflicts:
	AM2/AM2.mm
	Activity_log.mm~
	CM2(A)/CM2(A).mm
	CR4/CR4.mm
	IC/IC.mm
	IC/IC_bp.mm
	IFM9/IFM9.mm
	Schience_experiments/Schience_experiments.mm
	ShoppingList/ShoppingList.mm