calendar almost finished i correct Amets stff
calendar finished
merging
merging dan
fixing