some updates
Merge remote-tracking branch 'origin/master'

Conflicts:
	index.html
Merge branch 'master' of github.com:danpickford/WeddingSite

Conflicts:
	index.html