removing some unnecessary files
Merge branch 'master' of https://github.com/jwdallas/infinite-mashup