Ignoring .idea
New Gitignore
Merge branch 'master' of https://github.com/davidandorf/mimuz

Conflicts:
	.idea/workspace.xml