changes
merge

Conflicts:
	app/views/summary.html