merging with Github-based changes
Merge branch 'master' of github.com:betweenparentheses/facelook
friend image/border