before merge
Merge branch 'master' of http://github.com/Daiver/cpp-cgi-snippet
minor template fix