bla6
Merge branch 'master' of https://github.com/jbub/stopy

Conflicts:
	.idea/misc.xml
	Ear/StopyEar.iml