update
update
updaye
Merge branch 'UI' of https://github.com/Shihsuang/DoBuyTower into UI
Merge branch 'UI'
Merge branch 'master' into demo_test

Conflicts:
	UI/random_final/random.html
	UI/search_final/search.html