Revert "Merge branch 'Feature-addmacros' into 'prototype'"

Dallin Nickel (djn011)requested to merge
revert-3676e271 into Feature-addmacros

This reverts merge request !52 (merged)

Merge request reports