Update .gitignore
Merge branch 'master' of https://github.com/Seyrivor/BuzzFeed

Conflicts:
	.idea/workspace.xml