init
...
Merge branch 'master' of https://github.com/malliina/malliina.github.com

Conflicts:
	CNAME
	index.html