add fuga5
Merge branch 'master' of https://github.com/horiken4/test

Conflicts:
	fuga.txt