Test file
File 2
File 3
Merge branch 'branch2'
Added shopping cart markup
Redesigned home page
Added link to shopping cart on home page
Merge branch 'cart'

i#   (use "git push" to publish your local commits)