partially implemented buggy user data
Merge branch 'master' of github.com:blee42/oneday into dev
fixed database stuff