initial commit
Merge branch 'master' of github.com:robborow/jekyll-test

Conflicts:
	.gitignore