fix config
Merge branch 'master' into my_settings

Conflicts:
	lib/stock/db.rb
Merge branch 'master' into my_settings
fix some bugs and modulize
add basian
add basian_test