Got rid of some misplaced files
Merge remote-tracking branch 'origin/master'