adding to branch
new file in branch
Merge branch 'about_us'
added contact page
another file
added page
added css
account page
aaddt
Modified data
Added link to Search
Merge branch 'my_account'
Resolved conflict
new file
2nd file
1st
2nd