Updated makefile for use with the g++ compiler instead of clang++
Merge branch 'master' of github.com:paritybit0/MediaManager