Added merge_template script
Template change: Added an appendix: online ressources
Merge branch 'master' into bachelor
Toyed around with monokai colorscheme
Merge branch 'master' into bachelor