First commit
Merge branch 'master' of github.com:mafaik/mafaik.github.io

Conflicts:
	.gitignore