BLMS
Merge branch 'master' of https://github.com/Schottkey/web

Conflicts:
	academic/index.html
something gone pretty wrong
all fixed