library
Merge branch 'master' of https://github.com/lasoren/file_reconciler

Conflicts:
	EC504_Project/.classpath
	EC504_Project/bin/com/bitsPlease/FileReconciler/RecurrentHasher.class