Updating DB 1-9-2014
Merge branch 'master' of https://github.com/randyesq/Biohack

Conflicts:
	biohack2/biohack.sqlite