settings
Merge branch 'master' of https://github.com/Rivenation/LoungeTracker

Pulling arttu's work
s