Initial .gitignore
Merge branch 'master' of https://github.com/schmokko/Dezibel
Merge branch 'master' of https://github.com/schmokko/Dezibel
Merge branch 'master' of https://github.com/schmokko/Dezibel
Merge branch 'master' of ssh://ivv5ssh.uni-muenster.de/share/sev/sopraws1314/Gruppe3B

Conflicts:
	.gitignore
Merge branch 'master' of https://github.com/schmokko/Dezibel
Merge branch 'master' of https://github.com/schmokko/Dezibel

Conflicts:
	.gitignore
yx<dffdsfads