try again
Merge remote-tracking branch 'origin/master'

Conflicts:
	database/cmpe274.sql
	public/data/ratings.js
	public/lib/d3/d3.csv.js
	public/lib/d3/d3.js
	routes/index.js