foobarfoobar
Merge branch 'master' of https://github.com/MasatoNomura/gitlab20121008

Conflicts:
	foo.txt

conflict modify by manual
4
Merge branch 'topic'
Merge branch 'master' of https://github.com/MasatoNomura/gitlab20121008

Conflicts:
	foo.txt

6
commit test nomura
directory commmit test
directory delete test
.idea directory add test
.idea directory delete test
commit test
Merge branch 'master' into topic