initial commit
edited user model
Merge branch 'master' of https://github.com/mrkjlchvz/pmtool