Merge branch 'source'
Merge branch 'master' of github.com:marcmodin/marcmodin.github.io

Conflicts:
	.gitignore
	_config.yml
commited to source
all
updated index file
updated index file
Merge branch 'master' into source
Merge branch 'master' of github.com:marcmodin/marcmodin.github.io

Conflicts:
	.gitignore
	_config.yml
	index.html