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

Conflicts:
	smart-ai.lua
	wind-ai.lua