fixed errors
Merge branch 'master' of https://github.com/iamadamcooke/EverGreen.git

Conflicts:
	src/edu/gatech/cs2340/evergreen/DBHelper.java
fixed stuff