add line
add fugafuga
Merge branch 'master' of https://github.com/horiken4/test into topic2

Conflicts:
	fuga.txt
Merge pull request #3 from horiken4/topic2

Topic2