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

Conflicts:
	vcp.db