kris is commiting something
Merge branch 'master' of github.com:WLCSC/intranet

Conflicts:
	bootstrap/index.html