using unix lineending
Merge branch 'master' of github.com:est/tf2.est.im

Conflicts:
	src/index.html