Added .gitignore
Removed venv tracking
Removed cached venc and *.pyc
Changed settings.py for heroku deployment
Modified wsgi.py for heroku deployment
"?"
Resolved merge conflicts