New things
html templates
handled merge conflict in user_profile.html