fixed aiueo
fixed text
Merge branch 'feat/about2' into feat/about

Conflicts:
	about.html
added text
fixed text
added copy
added a
added b
added c.html
added c.html
Merge branch 'feat/reset' of github.com:Takachon/learn_git into feat/reset
Merge branch 'feat/reset' of github.com:Takachon/learn_git
added d.html
added e.html