commit before revert
Merge branch 'master' of https://github.com/cmrivers/ebola