Added a framework for reading from multiple files as specifired by the
config file.
Merge branch 'master' of github.com:Meldanya/pvg-vt13-team03

Conflicts:
	src/sorting/Sorter.java