j
Merge branch 'master' of https://github.com/tobeneck/SavingChristmas

Conflicts:
	weihnachts4Gewinnt/weihnachts4Gewinnt/Classes/Player/Hamster.cs
	weihnachts4Gewinnt/weihnachts4Gewinnt/Classes/Player/Player.cs
	weihnachts4Gewinnt/weihnachts4Gewinnt/Classes/Player/Sheep.cs
Merge branch 'master' of https://github.com/tobeneck/SavingChristmas
Merge branch 'master' of https://github.com/tobeneck/SavingChristmas
Merge branch 'master' of https://github.com/tobeneck/SavingChristmas
j
Merge branch 'master' of https://github.com/tobeneck/SavingChristmas

Conflicts:
	weihnachts4Gewinnt/weihnachts4Gewinnt/Classes/Player/Hamster.cs
	weihnachts4Gewinnt/weihnachts4Gewinnt/Classes/Player/Player.cs
	weihnachts4Gewinnt/weihnachts4Gewinnt/Classes/Player/Sheep.cs
Merge branch 'master' of https://github.com/tobeneck/SavingChristmas