test
i fixed the event.jade daddy
fixed the event tempalte
more style changes mostly to events
resolved conflicts