Git for git
Merge branch 'master' of https://github.com/SimonTakman/TDA367

Conflicts:
	MouseophonicServer/MouseophonicServer.iml