Created browse.html and forms.py in taxi directory
fixed merge conflict on views.py