Made some more templates
Merge branch 'master' of https://github.com/sanke93/Infosmos