update
Merge branch 'master' of https://github.com/Alerion/alerion.github.io

Conflicts:
	lvivpy-presentation/index.html
update