Merge branch 'master' of https://github.com/SvinSimpe/Beep
Modify Hejsan with bajshäst
Merge branch 'branch0' into development
Resolve conflict and the result is poop

Conflicts:
	Hejsan.txt
Merge branch 'master' of https://github.com/SvinSimpe/Beep into development
Merge branch 'development' of https://github.com/SvinSimpe/Beep into development