some work
Merge branch 'master' of https://github.com/jsl15/viceralColorProject

Conflicts:
	public/upload_stylesheet.css
	templates/imageselection.html
I'm so confused
?