Tue Dec  2 10:51:57 EST 2014
Merge branch 'master' of github.com:6004x/jade