Merge pull request #1 from MiguelABarbosa/jeff

Jeff
created testing requirements.txt
fixed merge conflict and removed all pyc and .idea files
push no longer working
Barebones project now follows pep8 and some basic unit tests for models
Merge pull request #2 from MiguelABarbosa/mike

Mike
update my files to develop