aaaa
Merge branch 'master' of github.com:Kjubo/luckysign

Conflicts:
	WebForMain/Default.aspx
	WebForMain/Quest/Talk.aspx.cs