first commit
Create README.md
Merge remote-tracking branch 'origin/master' into gh-pages
Merge branch 'gh-pages' of https://github.com/srikanthamiti/wedding_site into gh-pages

Conflicts:
	index.html
test
Merge branch 'gh-pages' of https://github.com/srikanthamiti/wedding_site into gh-pages

Conflicts:
	index.html