new alpha
Merge branch 'master' of https://github.com/lrl026/ohlala

Conflicts:
	lua/ai/smart-ai.lua
	lua/ai/standard_cards-ai.lua
	lua/ai/touhou-ai.lua
	touhou.lua