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
	LICENSE
	README.md
	_config.yml
	_layouts/default.html
	_layouts/post.html
	atom.xml
	css/main.css
	index.html
fix remaining site-specifics
Merge branch 'master' of https://github.com/gertjanvanzwieten/jekyll-template

Conflicts:
	_layouts/default.html
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
add show_hide script
Merge branch 'master' of https://github.com/gertjanvanzwieten/jekyll-template

Conflicts:
	_layouts/body.html
index: hide brackets for empty tags
Merge branch 'master' of https://github.com/gertjanvanzwieten/jekyll-template
add news tag
switch to absolute urls
keep tabbar on one line
Merge branch 'master' of https://github.com/gertjanvanzwieten/jekyll-template