comments
Merge pull request #108 from fleur/master

comments
Fixing merge conflicts
Added TemplateError enum
Fixing typos in README
Fixing typos in README
Fixing typos in README
Fixing typos in README
Changed TemplateError to just return &str instead of IoResult
Fixing merge conflicts