Added User model and controller
Merging