auto
whatevMerge branch 'master' of github.com:s-ec/s-ec.github.io

Conflicts:
	static/support/can/display.html
auto