Search"
Merge branch 'master' of github.com:chancancode/thehackerolympics-scoreboard

Conflicts:
	public/index.html