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

Conflicts:
	index.html
commit