test #2
test #3
test conflict #1
test conflict #2
Merge branch 'master' of
http://www.se.cs.titech.ac.jp/lecture/exp4/git/abeno.git

Conflicts:
	aaaaaa.txt