Added UserModel.java
Added variables, getters, setters, and constructors to UserModel.java
added comment to UserModel.java
Merge branch 'steven' into test
Merge branch 'bradley' of https://github.com/CMPUT301W14T10/Team-10-Project-W2014 into bradley