push
Merge branch 'master' of github.com:mCapricornus/mCapricornus.github.io

Conflicts:
	README.md