add db
Merge branch 'master' into my_settings

Conflicts:
	lib/stock/db.rb
fix tab2space