homepage
home
Merge branch 'master' of https://github.com/lrnzzz/frit-search

Conflicts:
	code/index.html
home
test.html