Merge branch 'feature/random_cin'
Merge branch 'dev'
mv test.rb cin.rb
count up
Merge branch 'dev'
add research result
change dir level
Merge branch 'dev'
Merge branch 'feature/count' into dev

Conflicts:
	src/test.rb
Merge branch 'research/branch' into dev

Conflicts:
	repo1/src/output.txt
Merge branch 'dev'
mv req.txt req.md
use markdown
tmp

メモ書き
update markdown
Merge branch 'master' into dev
Merge branch 'master' of github.com:yuki1090/git_research into dev
Merge branch 'dev' into research/branch
write 2nd requirement
add A