something is wrong
Merge branch 'master' of https://github.com/GregPlaysMC/GregPlaysMC.github.io

Conflicts:
	index.html