Merge branch 'develop' into patch-1

diff --cc docs/pages/tips-tricks.md
index c245d36c1dd3418179627b2701983edde9b7a075,934cf49b51fe425ef10ff7b8da995317a03b488c..f0834af498103780524a965f50b162b15810812c
--- 1/docs/pages/tips-tricks.md
--- 2/docs/pages/tips-tricks.md
+++ b/docs/pages/tips-tricks.md
@@@ -16,7 -16,7 +16,7 @@@ A framework is a collection of reusabl
  
  ## Need to know
  
- The sad truth about creating or coding HTML emails is that tables are the only things that are universally supported when it comes to email design. If you came from the world of building websites, this may seem like a stepping into Doc Brown's Delorean, charging up the Flux-capitor, and going back to 1996. Suddenly your CSS is written with inline style tags, useful CSS properties don't work and you're burried in a sea of table tags.
 -The sad truth about creating or coding HTML emails is that tables are the only things that are universally supported when it comes to email design. If you came from the world of building websites, this may seem like a stepping into Doc Brown's Delorean, charging up the Flux-capacitor, and going back to the 1996. Suddenly your CSS is written with inline style tags, useful CSS properties don't work and you're burried in a sea of table tags.
++The sad truth about creating or coding HTML emails is that tables are the only things that are universally supported when it comes to email design. If you came from the world of building websites, this may seem like a stepping into Doc Brown's Delorean, charging up the Flux-capacitor, and going back to the year 1996. Suddenly your CSS is written with inline style tags, useful CSS properties don't work and you're burried in a sea of table tags.
  
  <div class="callout secondary tip">General rule of thumb: your email is not going to look identical in every client. And that’s OK.</div>