123
Merge branch 'master' of https://github.com/wizard1990/cse223lab3

Conflicts:
	triblab/binKeeper.go