Added UserModel.java
Added variables, getters, setters, and constructors to UserModel.java
added comment to UserModel.java
Merge branch 'steven' into test