Project Skeleton
Resolved conflicts
Merge branch 'master' of https://github.com/exbuddha/Music

Conflicts:
	src/music/README.md