Merge branch 'master', remote-tracking branch 'origin/master'
Merge branch 'master', remote-tracking branch 'origin/master'
Merge branch 'master' of https://github.com/dbhubbell/explore_california
lynda conflict merge
resolved conflict
resolved conflict