Merge remote-tracking branch 'origin/master'

ferdingler · ferdingler · commit 493b4b5e8440 · 2018-10-09T08:27:52.000-07:00
# Conflicts:
#	README.md
diff --git a/README.md b/README.md
@@ -158,4 +158,3 @@ The Dashboard will look something like this:
 
 ![CloudWatch](docs/cloudwatch.jpg)
 
-

Original file line number	Diff line number	Diff line change
`@@ -158,4 +158,3 @@ The Dashboard will look something like this:`
`158`	`158`
`159`	`159`	`![CloudWatch](docs/cloudwatch.jpg)`
`160`	`160`
`161`		`-`