Small changes working towards compiling
Merge branch 'master' of https://github.com/codyfrenzel/GetMyMusic
merging