changed twitter texts
solved conflicts
Merge branch 'layout' into gh-pages

* layout:
  changed twitter texts