fixed merge errors
added server notes
 google map now shows dynamic directions
merge conflict
fixing merge conflicts
git push origin masterMerge branch 'crouseMatthew'
 merged everyones files