Merge branch 'approxMatch'

Conflicts:
	.DS_Store
matcher class is fixed and documented, common words text file is added
Merge branch 'master' of https://github.com/mbojey/COSC310A2

Conflicts:
	.DS_Store
	SearchStorage.txt
	bin/Populate.class