changed gitignore
Merge branch 'master' of https://github.com/glukas/Social

Conflicts:
	.gitignore