Alpha commit
Merge branch 'master' of https://github.com/digiscot/digiscot.github.io

Conflicts:
	CNAME
	index.html
Fix merge