inserted my name
merge iled:master
Merge commit '2c9389e'

Conflicts:
	sinfo/templates/index.html