filled out union difference and product.
still needs code to store information from parse_atomic to call the db engine correctly
Merge branch 'master' of https://github.com/johnprock/315

Conflicts:
	src/parser.h
small details