Added styles/bootstrap
Deleted merge conflicts in UserController