/home/tberger/haskell/bayes_classifier/bayesClassifier.hs autocommit from emacs
/home/tberger/haskell/bayes_classifier/bayesClassifier.hs autocommit from emacs
/home/tberger/haskell/bayes_classifier/bayesClassifier.hs autocommit from emacs
/home/tberger/haskell/bayes_classifier/bayesClassifier.hs autocommit from emacs
/home/tberger/haskell/bayes_classifier/bayesClassifier.hs autocommit from emacs
/home/tberger/haskell/bayes_classifier/bayesClassifier.hs autocommit from emacs
Merge branch 'master' of https://github.com/teberger/haskell

Conflicts:
	bayes_classifier/bayesClassifier.hs
/home/tberger/haskell/bayes_classifier/bayesClassifier.hs autocommit from emacs