added .idea
Merge branch 'master' of https://github.com/AlmaasAre/volleyballviewer

Conflicts:
	.DS_Store
	.gitignore