AnimationNormalMap
Merge branch 'master' of https://github.com/denthler/Grupp5LitetSpelprojekt

Conflicts:
	SteamPunk_Platform/Enemy.cpp
	SteamPunk_Platform/Enemy.h
	SteamPunk_Platform/FallingEnemy.h
	SteamPunk_Platform/NonFallingEnemy.h
	SteamPunk_Platform/Player.cpp
	SteamPunk_Platform/World.cpp
	SteamPunk_Platform/model.h