Remove idea files
Remove idea files
Merge branch 'master' of github.com:martinmicunda/chitter-prototype

Conflicts:
	.gitignore