deleted
header and footer work
header and footer work
header and footer work
deleted
deleted
deleted
deleted
deleted
deleted
Merge branch 'master' of https://github.com/tikalk/tikal-jekyll-site

Conflicts:
	_layouts/post.html