Basic user profile done. Added current_user helper to applications controller
Merge conflicts in _header.erb solved
Merge pull request #18 from nairys/user_profile_page

user_profile_page