Deleted
From Laptop
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	data/sector_id_master.txt
	data/stock_id_master.txt
	dbscripts/create_views.sql