added conftest.py file for pytests
Merge branch 'master' of https://github.com/jonathangarza/mmf_problem