Removed files not required for Heroku
Merge master