added some templates
Merge branch 'master' of https://github.com/sdierauf/site
shouldnt be any conflicts