Merge branch 'web'
Merge branch 'master' of github.com:erahm/fatbard