correct social media text for one of our speakers
Merge branch 'master' of github.com:jsla/js.la
Merge branch 'master' of github.com:jsla/js.la
Merge branch 'master' of github.com:jsla/js.la
fix conflict