this might be wrong since the data generator is changing stuff
Merge branch 'master' of https://github.com/vqdo/cse135

Conflicts:
	Resources/allSQL.sql