Again
Merge branch 'master' of https://github.com/gotpop/gotpop-email-builder
Merge remote-tracking branch 'origin/work'
Merge remote-tracking branch 'origin/work'
Added first version of loop-2.js

doesn't work just yet!