search functionality
Merge branch 'Ricky's-Branch' of https://github.com/samternent/HackssonBergs into Ricky's-Branch

Conflicts:
	client/bets.js
change
Merge branch 'Ricky's-Branch' of https://github.com/samternent/HackssonBergs into Ricky's-Branch