some changes to naive bayes
merged naive bayes at the two sources
added labels to conf matrix