add fields
add jade
Merge branch 'master' of github.com:osboo/masonsmafia