updates and merging
trying again
again again
Merge pull request #2 from propagated/logic1

Logic1