changed photos in carousel and changed event dates
resolve conflict in bus.yml
fixing marker locations
fixed conflict in businesses