things
Merge branch 'master' of https://github.com/Poofyfancypants/Destiny-Falls
stuff
new runes
Merge branch 'master' of https://github.com/Poofyfancypants/Destiny-Falls

Conflicts:
	DestinyFalls/Release/DestinyFalls.log
	DestinyFalls/Release/DestinyFalls.pdb
	DestinyFalls/Release/DestinyFalls.tlog/CL.read.1.tlog
	DestinyFalls/Release/DestinyFalls.tlog/CL.write.1.tlog
	DestinyFalls/Release/DestinyFalls.tlog/cl.command.1.tlog
	DestinyFalls/Release/vc120.pdb
	DestinyFalls/Source/Game States/CombatState.cpp
Merge branch 'master' of https://github.com/Poofyfancypants/Destiny-Falls

Conflicts:
	DestinyFalls/Source/Game Objects/Player.cpp
as
new fonts