updated to upstream
updated to upstream
maybe resolved conflict
added requirements.txt
changed port
Update server.py

moved app.run to back where it belongs. White space alterations don't need reverting.
Merge pull request #2 from gerbal/master

added requirements.txt