INIT
Merge branch 'master' of github.com:spencerlyon2/functionalMacro