Template setup
Merge pull request #8 from cts12/feature/simon

Template setup