removed unsued files that have been moved in assets
Merge remote-tracking branch 'origin'

Merging with austin's changes.