Added image cropping at front end
Merge branch 'master' of https://github.com/jasonpeng/cs3246-assignment2

Conflicts:
	server/index.html
Finished form for searching with color.
Merge branch 'assignment3' of https://github.com/jasonpeng/cs3246-assignment2