merge master
prepush
Merge pull request #65 from janaspage/master

Removing declaration of unused 'socket' in index.
Merge branch 'master' of https://github.com/tcb-hr/feed
Merge pull request #66 from janaspage/master

Reincluding declaration of socket in index, per Alex's request.
Correct CSS shorthand from jQ to JS.
Merge branch 'picfix'
Merge pull request #67 from janaspage/master

Correction to the jQuery-to-JS rewrite of Instagram.
Merge branch 'master' of https://github.com/tcb-hr/feed
twinjet
twinjet 2.1
Merge branch 'master' into font