Modified .gitignore
Merge branch 'master' of https://github.com/QVDev/Twitflicks

Conflicts:
	.gitignore