Working on updating/filtering
Merge branch 'master' of https://github.com/cheunjm/cs171-project-jcheun-rkim

Conflicts:
	usColleges.js