resolved merge conflict
resolved merge conflict

shravan20084312/citygram,shravan20084312/citygram,codeforamerica/citygram,codeforamerica/citygram,codeforamerica/citygram,BetaNYC/citygram-nyc,BetaNYC/citygram-nyc,codeforamerica/citygram,BetaNYC/citygram-nyc,shravan20084312/citygram,BetaNYC/citygram-nyc