ACS mapping application 2

Merge branch 'master' of https://github.com/will0955/acs_map

Conflicts:
	ui.R
update

Merge branch 'master' of https://github.com/will0955/acs_map

Conflicts:
	ui.R