first!!1111einseinself
second change! :)
joa bissel was verändert :)
01
Merge branch 'master' of https://github.com/doghoc/joggeltower

Conflicts:
	.DS_Store
Merge branch 'master' of https://github.com/doghoc/joggel_01