Made master template more configurable
Added an example document
Merge branch 'master' of https://github.com/sahib/libmunin-thesis

Conflicts:
	conf.py
	tex/meta._tex