_site
Merge branch 'soulmatt'

Conflicts:
	_site/index.html
1
2
3
8
Create README.md
Merge branch 'master' of https://github.com/soulmatt/soulmatt.github.io into soulmatt

Conflicts:
	_site/index.html