Added django-taggit to requirements (for portfolio)
Fixed merge conflict and added requirements.txt