convert to unix
Merge branch 'master' of github.com:sboily/xivo.io

Conflicts:
	index.html