cool
Merge branch 'lerklift' of github.com:lifesfun/ShineExtensions into lerklift

Conflicts:
	output/lua/Player_Lift.lua
cool