Add points logic
Merge remote-tracking branch 'origin/master'

Conflicts:
	Web/map.html
Merge branch 'master' of https://github.com/eileenwei/DirectRelief-Project

Conflicts:
	Web/map.html
Merge branch 'master' of https://github.com/eileenwei/DirectRelief-Project