small changes
Merge branch 'data-collector' of
https://github.com/oskar-montin/datx02-stock-analyzer.git into
data-collector

Conflicts:
	DataCollector/src/collector/DatabaseHandler.java