Added .idea folder to .gitignore
Merge branch 'master' of https://github.com/silne30/TPCv4

Conflicts:
	.idea/workspace.xml