add updated files
Merge branch 'master' of https://github.com/GregSchultz/sonar

Conflicts:
	metricsTest.json
	output/metricsTest.csv