Added did you know bar
Merge branch 'master' of github.com:audreycarlsen/sloth_express

Conflicts:
	app/views/layouts/application.html.erb
Merge branch 'master' of github.com:audreycarlsen/sloth_express
Order and OrderItem validations
Merge branch 'master' of github.com:audreycarlsen/sloth_express