Added social media buttons
remove conflict
Merge branch 'dev' of https://github.com/akarpul/bitstarter into dev