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

Conflicts:
	index.html
test junk