Remove an unnecessary file #11
Merge branch 'encoding'