added bootstrap template
Minify HTML output
switched back to std fonts
Merge branch 'ubuntu-fonts'

Conflicts:
	content/1.projects/1.project-1/01.jpg
	content/1.projects/1.project-1/02.jpg
	content/1.projects/1.project-1/03.jpg
	content/1.projects/1.project-1/04.jpg
	content/1.projects/1.project-1/thumb.jpg
	content/1.projects/10.project-name-10/01.jpg
	content/1.projects/10.project-name-10/02.jpg
	content/1.projects/10.project-name-10/03.jpg
	content/1.projects/10.project-name-10/04.jpg
	content/1.projects/10.project-name-10/thumb.jpg
	content/1.projects/2.movie-project-2/1.560x445.m4v
	content/1.projects/2.movie-project-2/2.560x445.mov
	content/1.projects/2.movie-project-2/thumb.jpg
	content/1.projects/3.project-name-3/01.jpg
	content/1.projects/3.project-name-3/02.jpg
	content/1.projects/3.project-name-3/03.jpg
	content/1.projects/3.project-name-3/04.jpg
	content/1.projects/3.project-name-3/thumb.jpg
	content/1.projects/4.youtube-project-4/thumb.jpg
	content/1.projects/4.youtube-project-4/youtube-embed.html
	content/1.projects/5.vimeo-project-5/thumb.jpg
	content/1.projects/5.vimeo-project-5/vimeo-embed.html
	content/1.projects/6.swf-project-6/1.560x430.swf
	content/1.projects/6.swf-project-6/2.560x430.swf
	content/1.projects/6.swf-project-6/thumb.jpg
	content/1.projects/7.mixed-media-project-7/1.560x445.mov
	content/1.projects/7.mixed-media-project-7/2.560x430.swf
	content/1.projects/7.mixed-media-project-7/3.jpg
	content/1.projects/7.mixed-media-project-7/thumb.jpg
	content/1.projects/7.mixed-media-project-7/youtube-embed.html
	content/1.projects/8.project-name-8/01.jpg
	content/1.projects/8.project-name-8/02.jpg
	content/1.projects/8.project-name-8/03.jpg
	content/1.projects/8.project-name-8/04.jpg
	content/1.projects/8.project-name-8/thumb.jpg
	content/1.projects/9.project-name-9/01.jpg
	content/1.projects/9.project-name-9/02.jpg
	content/1.projects/9.project-name-9/03.jpg
	content/1.projects/9.project-name-9/04.jpg
	content/1.projects/9.project-name-9/thumb.jpg
	content/1.projects/category.yml
	content/1.projects/project-11/01.jpg
	content/1.projects/project-11/02.jpg
	content/1.projects/project-11/03.jpg
	content/1.projects/project-11/04.jpg
	content/1.projects/project-11/thumb.jpg
	content/2.about/werkplaats_informations.pdf
	content/3.contact-me/01.jpg
	content/_shared.yml
	content/index/index.yml
	templates/category.html
	templates/page.html
	templates/partials/assets/images.html
	templates/partials/assets/media.html
	templates/partials/assets/pdfs.html
	templates/partials/assets/swf.html
	templates/partials/assets/video.html
	templates/partials/feed/feed_entry.atom
	templates/partials/navigation/category-lists.html
	templates/partials/navigation/children.html
	templates/partials/navigation/navigation.html
	templates/partials/navigation/projects-list.html
	templates/partials/sitemap/sitemap-url.xml
	templates/project.html
	templates/sitemap.xml
little fixes
little fixes
littl beaty corrections
changed 404
Merge branch 'my' into my-3.0
Update README.md
Make minify process a setting

Minifying is now off by default. It can be turned on for all pages by
adding 'minify: true' to _shared.yml. Or it can be turned on for an
individual page by adding 'minify: true' to the page variables.
Merge remote-tracking branch 'remotes/upstream/master' into my-3.0
modified footer and the feed template
- added banner tag to first menu link
- updated components
added missing files
removed a deprecated file
the current page is now "active" in the menu
correcting the collapsing behavior of navbar
whitespace correction
Merge branch 'master' into my-3.0