starting wedding page
Merge branch 'master' into gh-pages

Conflicts:
	index.html
	js/index.js
	stylesheets/base.css
	stylesheets/skeleton.css