adding logic to return stuff from user prefs first
Merge branch 'master' of github.com:TimeHackathon/TimeTime