Adding desktop repo
Merge branch 'master' of https://github.com/MaCaki/academic-site

Conflicts:
	permutohedra.php
Merge remote-tracking branch 'origin/master'