Removed clashing files.
Merge pull request #108 from F21/devel

Removed clashing files.