Deal with conflict
Merge branch 'master' of
https://github.com/robertcao/CMPE275_Project1.git

Conflicts:
	src/project1/cmpe275/sjsu/conf/Configure.java
Update DBManager and Configure