initial commit
initial commit
Initial commit
Merge branch 'master' of https://github.com/pnichols104/wedding-website
Merge branch 'master' of https://github.com/pnichols104/wedding-website

Conflicts:
	.gitignore