to merge
to merge
Fixed the twitter bug, implemented a controller to fetch twitter data on servr side and feed it back to the client
Merge branch 'master' of github.com:nko4/website
Merge branch 'master' into fixTwitter
merged master into this branch and changed the extends layout-2013 to layout on judges/new, since the new layout is not defined to here yet
with the new jquery sintax
updated the twitter model to use twit module
less invasive shrinkwrap
Merge remote-tracking branch 'origin/master' into fixTwitter
fixes
handle when secrets are commented out
secret syntax change
ok, i couldn't do a less invasive shrinkwrap
remove ntwitter
space
space
Merge pull request #49 from nko4/fixTwitter

fix twitter