icon magic
Merge remote-tracking branch 'origin/master'
adds Facebook and twitter links