fixed merge errors
added server notes
 google map now shows dynamic directions
merge conflict