Added User Settings and Tests
Merge branch 'master' of https://github.com/panjiw/Team-Player