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

Conflicts:
	index.html
removed google map
changed image
added analytics
added people
added Fred
typo