local
Merge branch 'master' of https://github.com/aravindbuddha/tusearch

Conflicts:
	index.html
	js/scripts.js
updated
update