Generate all the data and put it into someones sql, preferably mine
use barcrawldb instead of barcrawldb2
we don't need this no more
testing server
starting up on that homepage
Merge branch 'master' into scott

Conflicts:
	views/index.haml