fixed merge conflicts in views.py
fixed merge conflicts in views.py

zztimy/CMPUT404-project-socialdistribution,YufeiZhang/CMPUT404-project-socialdistribution,kdhaywar/CMPUT404-project-socialdistribution,kdhaywar/CMPUT404-project-socialdistribution,YufeiZhang/CMPUT404-project-socialdistribution,zztimy/CMPUT404-project-socialdistribution,kdhaywar/CMPUT404-project-socialdistribution,YufeiZhang/CMPUT404-project-socialdistribution,YufeiZhang/CMPUT404-project-socialdistribution,kdhaywar/CMPUT404-project-socialdistribution