add twitter follow me button
repace 5x5+5 Goals with Goalsetr, adjust Title
Merge branch 'develop' into staging