123
fix
Merge branch 'master' of https://github.com/lrl026/ohlala

Conflicts:
	sjcm.lua