Revert back to sqlite3 database
Edit tabs
Merge branch 'master' of github.com:EricRho/StockApp

Conflicts:
	db/development.sqlite3
	log/development.log
	tmp/pids/server.pid