Templates
Merge pull request #39 from PhilippSteiner/Philipp

Templates