Merge branch 'master' of https://github.com/PamelaFuller/Titan-Player.git