basic func done
basic
basic done
Merge branch 'master' of https://github.com/Mouther/What-can-I-do-

Conflicts:
	python/03tainanparkinfo.xml
	python/art
	python/ggc.py
	python/landmark2.csv