Merge branch 'master' of https://github.com/jscharf92/CSV_Reader

Conflicts:
	testdata.csv