added union and minus
Merge branch 'master' of https://github.com/mtank/CS4370Project1