removed dos line endings
Merge branch 'gh-pages'

Conflicts:
	index.html
fix bad links
Merge branch 'gh-pages'
Merge commit '11ee21df8a406627f60725a47600318e335a706e'