deleted junk files
Merge branch 'development'