commiting to combo with twitter stuff
Merge branch 'master' of github.com:GoogleJump/ninja