class n stuff
yes
Merge branch 'doorpuzzle'

Conflicts:
	Piggy_Game/Level1.cpp
	Piggy_Game/Piggy_Game.vcxproj.filters
Merge remote-tracking branch 'origin/TextureManager-Episode-III---The-Return-of-the-Sprites'
Fade and bear
dialog changes
Added LoadTexture()

To TextureManager so you can load shit outside of the class.
paralax scrolling motherfuckers
scrollade åt fel håll, fixat

XD
fuck convars, leveldependant istället
dis be weird
Uppdaterad kamera
Kamerafix
Merge branch 'master' into paralax
Merge branch 'teddy' into paralax

Conflicts:
	Piggy_Game/Level2.cpp
	Piggy_Game/LevelImp.cpp
i dont even
texturemanager
lolwat
Stuff