add Gemfile, ignore lock
atom: move site-dependent fields to _config.yml
generalize tabs via _data/tabs.yml
Initial commit
add initial files
Merge branch 'master' of https://github.com/gertjanvanzwieten/jekyll-template

Conflicts:
	README.md
Merge branch 'master' of https://github.com/gertjanvanzwieten/jekyll-template

Conflicts:
	.gitignore
	README.md
	_config.yml
	_layouts/default.html
	css/main.css
fix remaining site-specifics
Merge branch 'master' of https://github.com/gertjanvanzwieten/jekyll-template
split body from default, remove javascript
Merge branch 'master' of https://github.com/gertjanvanzwieten/jekyll-template

Conflicts:
	_config.yml
	_layouts/default.html
add scripts dir
Merge branch 'master' of https://github.com/gertjanvanzwieten/jekyll-template

Conflicts:
	_layouts/body.html
add show_hide script
index: hide brackets for empty tags
keep tabbar on one line
Merge branch 'master' of https://github.com/gertjanvanzwieten/jekyll-template