Added functionality to register user
Merge commit