Merge branch 'master' of /Users/kavya/Documents/UIUC/Junior Year/CS 242/CS242_Final with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/js/canvas.js
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/js/fetchPictures.js
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
location stuff