Images are now displayed in event view.
Merge branch 'master' of github.com:Woildan/info153-final-project

Conflicts:
	js/main.js
	js/view-event.js