more testS
Merge branch 'codegen_times' of github.com:spantela/stella-cs265 into codegen_times
more hybrid tests
Merge branch 'codegen_times' of github.com:spantela/stella-cs265 into codegen_times

Conflicts:
	code_generation_tests/select_compiled.c
codegen tests
Merge branch 'codegen_times' of github.com:spantela/stella-cs265 into codegen_times

Conflicts:
	code_generation_tests/select_compiled.c
Merge branch 'codegen_times' of github.com:spantela/stella-cs265 into codegen_times
Merge branch 'codegen_times' of github.com:spantela/stella-cs265 into codegen_times
Merge branch 'codegen_times' of github.com:spantela/stella-cs265 into codegen_times

Conflicts:
	client
	code_generation
	generate_table
	server
	test_btree
hybrid tests