redone
Merge branch 'master' of https://github.com/shiyuki/hello-world

Conflicts:
	About Me Homework.Rmd