ang routes working
adding markers done
adding markers
map updates
merge