Merge branch 'master' into TextManager

Conflicts:
	Piggy_Game/Piggy_Game.vcxproj.filters
Config shizz
Merge branch 'TextManager' of https://github.com/tEFFx/piggy into TextManager

Conflicts:
	Piggy_Game/Piggy_Game.vcxproj.filters