Change to the SQL table, make sure to delete existing.
Merge remote-tracking branch 'origin/master'

Resolved Conflicts:
	BlockTracker/src/BlockTrackerSQL.java
	BlockTracker/src/cm.java