rebase example.. moving ahead of client branch.
Merge remote-tracking branch 'origin/server' into dev