formatting and correcting docstrings
docstring and remove one_hot from mnist
test that Or and And termination criteria are initiated with a list of termination criteria
remove extra s from asssert
fix merge conflict
Merge pull request #716 from capybaralet/master

Some Formatting and tests for termination_criteria Or and And