gngn
Merge branch 'master' of https://github.com/GoomiChan/GoomiChan.github.io

Conflicts:
	New Text Document.txt