team text
Merge branch 'master' of https://github.com/juueli/FIXSTHML

Conflicts:
	index.html