Changes to Main and CommandLine
Merge branch 'master' of https://github.com/lasoren/file_reconciler

Conflicts:
	EC504_Project/bin/.gitignore