Create buddies page and profile editing
Merge Remote Branch