Merge branch 'ben-holden-master'

 especially if it merges an updated upstream into a topic branch.
Merging Ben's initial changes

Merging Ben's initial changes
Merge pull request #2 from ben-holden/master

Homepage pretty much complete, all images and text updated and style apa...
made the header clickable again
Merge branch 'master' of https://github.com/notquitehere/ataste

Conflicts:
	header.php
made the header different on the first page.
- add additional fields to checkout page for gift options, including associated jQuery for making the gift message appear/disapear
- ammend footer to include links to contact, returns policy and privacy policy
- ammended excludes to not show "functional" pages as sections on main page
- removed supurflous jQuery
Merge pull request #1 from notquitehere/master

Merge Tas master