Ubuntu用makefileを更新
Merge branch 'master' into KAUBRAGI+-0.1.0.1

Conflicts:
	MikuMikuGTK+/annotation.h
	makefile