tiles for Jabol
Signed-off-by: Cimreau <learnedman@gmail.com>
Signed-off-by: Cimreau <learnedman@gmail.com>
Merge branch 'master' of https://github.com/Chocolancer/techpro2

Conflicts:
	dagame/obj/GameDevStoryConfig.old
	dagame/obj/GameDevStoryConfig.xml
Merge branch 'master' of https://github.com/Chocolancer/techpro2
be good now git
Merge branch 'master' of https://github.com/Chocolancer/techpro2