Generate Profile model
Generate Profiles controller and routes. Added association between profile and user
Added/updated views for profiles/users/application controllers
Updated views and controllers for profile and user
Fix conflict