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

Conflicts:
	index.html
test

test