added a conversion script, getting json object ready for more ff teams, html/jade cleanup
Merge branch 'master' of https://github.com/shaunkatona/ff
git said I needed to pull before it'd let me push.  not sure why.