Merge branch 'master' of /Library/WebServer/Documents/geek with conflicts.
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge
Merge remote-tracking branch 'origin/master'