adding some web stuff
Merge branch 'master' of https://github.com/lfoppiano/bbhack-2014
Merge branch 'master' of https://github.com/lfoppiano/bbhack-2014