Merge branch 'master' of github.com:Gandalph/binom.website

Conflicts:
	css/index.css