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

Conflicts:
	.gitignore
Merge remote-tracking branch 'origin/master'