Added Makefile
Merge branches 'develop_daniel' and 'develop' into develop
Merge branch 'develop' of https://github.com/jasonsinn/player into develop