commit1
Merge branch 'master' of https://github.com/maclover7/maclover7.github.io

Conflicts:
	index.html