first commit
basic setup
Merge branch 'master' of https://github.com/toddwschneider/weddingram

Conflicts:
	.gitignore