fixed and replaced test and flajoletMartin
Merge branch 'master' of https://github.com/torybash/SAD2-Project.git

Conflicts:
	MySQLTest/src/FlajoletMartin.java