test
phase2 phase3
Merge remote-tracking branch 'origin/hbase'

Conflicts:
	src/edu/cmu/andrew/project619/db/MySqlConnector.java
	src/edu/cmu/andrew/project619/p1/q3.java