remove "11111"
Modify 2nd line
Edit Numbers
Change the order
Merge branch 'master' into feature_hiyoko40

Conflicts:
	Numbers
Merge remote-tracking branch 'origin/master'

Conflicts:
	Numbers
Edit Numbers
add "Git Dojo!" to line 5
Add "Hello, World" 1st line
Delete 2nd line
Add PI 3rd line
Add "aiueo" 8th line
Fix conflict
Merge branch 'feature_yosukeota'

Conflicts:
	Numbers
Merge branch 'master' into feature_hiyoko40

Conflicts:
	Numbers
Merge branch 'master' into feature_siman