asdf
Merge branch 'master' of https://github.com/Poofyfancypants/Destiny-Falls
	m_StringTable[6][4] = "Companions";
Merge branch 'master' of https://github.com/Poofyfancypants/Destiny-Falls

Conflicts:
	DestinyFalls/Source/Game States/GameplayState.cpp
TurnInMerge
asdf
RealTurnIn