update
update
Merge branch 'master' of github.com:kain-jy/large-colony

Conflicts:
	web/templates/index.html