Resolved merge conflict for requirements.txt.
Merge pull request #87 from arxanas/requirements-merge-conflict

Resolved merge conflict for requirements.txt.