added calandar
calandar in place but modal not working
got calandar and modal working
all working
fixed conflics