Merge branch 'master' of github.com:johnotander/pixyll

Conflicts:
	.gitignore
	README.md
	_config.yml
	_layouts/default.html
	_layouts/page.html
	_layouts/post.html