modified:   .gitignore
Merge branch 'master' of github.com:scottyg/feed_factory

Signed-off-by: Scott Gordon <me@scottyg.net>

Conflicts:
	.gitignore