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

Conflicts:
	vcp.db
la
Merge branch 'master' of https://github.com/jsl15/viceralColorProject

Conflicts:
	public/uploadjavascript.js
	vcp.db