old computer changes.
Merge branch 'master' of https://github.com/ishippers/Wedding-v2

Conflicts:
	charleston.html
	index.html