commit db changes
Merge branch 'master' of https://github.com/vdifatta/HelixII

Conflicts:
	DB/helixDB
committing database