almost brushable
Merge branch 'master' of https://github.com/everlane12/CS171-Final-Project

Conflicts:
	bikes2.js
small conflicts resolved