My profile page
first commit for my new profile
fixed conflict