edited shops html and css
Merge branch 'master' of https://github.com/meet-projects/shooksookbytes-y2-2013
Merge branch 'master' of https://github.com/meet-projects/shooksookbytes-y2-2013
worked on the tourists and shops
did the homepage
worked on customers
done About
merge
merging
added most of the buttons to jango