Frans's changes and replace tabs with spaces
Merge pull request #33 from gannetson/frans-templates

Frans's changes and replace tabs with spaces