Add "Hello, World" 1st line
Delete 2nd line
Add PI 3rd line
Add "aiueo" 8th line
Merge branch 'feature_yosukeota'

Conflicts:
	Numbers