hi

bye
hi
Merge branch 'master' of https://github.com/alalexl/SKAM

Conflicts:
	index.html
	myevents.html