about
Merge branch 'master' of https://github.com/Aikerim/aikerim.github.io

Conflicts:
	index.html
about