trying to figure git out
Merge branch 'master' of https://github.com/antwerx/antwerx.github.io

Conflicts:
	index.html
jekyll install