feature/template_engine

Zwischenstand 28.07.2014
test
template_engine/gitignore
master/conflict