add a playgrounddd
changed requirements.txt back to normal
handled merge conflict
problem in line 2 of views.py