edit user name #14
Merge branch 'master' of github.com:simplereach/buddybuddy