give me
Merge branch '1d' of github.com:rvillan/cse132b into 1d

Conflicts:
	reports/1c.jsp