adding UserModel.cpp and changes to UserModel.h
adding UserModel.cpp and changes to UserModel.h
resolved conflicts in UserModel.h
changes in UserModel.cpp
changes to UserModel.cpp and UserModel.h