Project and .gitignore updates
Merge branch 'master' of https://github.com/Sh3z/Chatter

Conflicts:
	.project