Testing SQL query
SQL query testing
Merge branch 'master' of https://github.com/Campaign-Data-Visualization/campaign-cents

Conflicts:
	server/main/config.js