Merge remote-tracking branch 'origin/develop'
Merge remote-tracking branch 'origin/develop'
Merge remote-tracking branch 'origin/develop'
oops broke transform

Signed-off-by: Ryan Luton <ryan@lutonmedia.com>
ga fix and footer a.color

Signed-off-by: Ryan Luton <ryan@lutonmedia.com>
Merge remote-tracking branch 'origin/master' into develop