Deleted old files
Merge branch 'master' of https://github.com/rmcgibbo/mixtape
Some type changes
Merge pull request #43 from rbharath/build_bug_fix

Build bug fix