Merge branch 'master' of https://github.com/brudquist/brittany-marie-site

Conflicts:
	.gitignore