Shortening the dwarf
Merge branch 'master' of https://github.com/MrAaaah/AEMI_GameJam_H14

Conflicts:
	Assets/Scenes/Game_without_level.unity
	Assets/Scripts/Controllers/PlayerControl.cs
Merge branch 'master' of https://github.com/MrAaaah/AEMI_GameJam_H14
Integrating asset
Merge branch 'master' of https://github.com/MrAaaah/AEMI_GameJam_H14
Integrating asset
Merge branch 'master' of https://github.com/MrAaaah/AEMI_GameJam_H14

Conflicts:
	Assets/Scenes/Game_without_level.unity