Merge branch 'master' into dev

khoadnguyen · web-flow · commit 01e98d024057 · 2018-10-31T08:50:28.000-07:00
diff --git a/README.md b/README.md
@@ -1,3 +1,5 @@
+[![Waffle.io - Columns and their card count](https://badge.waffle.io/SoftStackFactory/reboot.svg?columns=all)](https://waffle.io/SoftStackFactory/reboot)
+
 ![Travis CI Status](https://travis-ci.org/SoftStackFactory/reboot.svg?branch=master "Travis CI Status")
 
 

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+[![Waffle.io - Columns and their card count](https://badge.waffle.io/SoftStackFactory/reboot.svg?columns=all)](https://waffle.io/SoftStackFactory/reboot)`
	`2`	`+`
`1`	`3`	`![Travis CI Status](https://travis-ci.org/SoftStackFactory/reboot.svg?branch=master "Travis CI Status")`
`2`	`4`
`3`	`5`