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

Conflicts:
	index.html
test