deleted: unnecessary files
Merge branch 'development'