parser and parser test working fully
Merge pull request #12 from skuhlmann/template

parser and parser test working fully