Added union, star, accept, and a number of other functions
adding todos
Merge remote-tracking branch 'upstream/master'

Getting changes made during pair programming