Initial commit
test commit
Merge branch 'master' of https://github.com/plinx/plinx.github.io

Conflicts:
	index.html
commit CNAME