fixed style.css; followme margin
Merge branch 'dev'
fixed hashtagfor tweets
merging dev into master
merging master into github-master