Got rid of old files
Merge branch 'master' into new_project