event.html : little adjustment due to merge conflict.
event.html : little adjustment due to merge conflict.

clemens-huebner/amos-ss16-proj8,clemens-huebner/amos-ss16-proj8,clemens-huebner/amos-ss16-proj8