edit error
Merge pull request #1 from leknoppix/branch_template

edit error