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

Conflicts:
	prototype/imageselection.html
	prototype/mobile.html
	prototype/stylesheet_prototype.css
	prototype/website_page.html