added a user model and secure passwords
Merge branch 'user-modeling-rev'