Modified gitignore
Merge branch 'master' of https://github.com/YeyaSwizaw/teabag

Conflicts:
	.gitignore