deleted:    ../ColorsHollasch.lua
	new file:   ../LuaState.lua
	new file:   ../lua_ffi.lua
	modified:   ConvertHollasch.lua
	new file:   test_LuaState.lua
Merge branch 'master' of https://github.com/Wiladams/LAPHLibs

Conflicts:
	ColorsHollasch.lua

	new file:   ../ColorsHollasch.lua
	modified:   ../mime.lua
	modified:   ConvertHollasch.lua