Hack week 2012
Merge branch 'master' of github.com:Salinon/JSJack