half merged..?
guarded against gcal import exceptions, and put a message if events is empty
Merge branch 'master' of https://github.com/poppetdanzinger/shyshyschullie-website

Conflicts:
	app/static/css/alex.css