Merge branch 'master' into fixes_ng_module_error

bsouthga · bsouthga · commit 2f0ebba41667 · 2016-06-06T12:03:11.000-04:00
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,5 @@
 language: node_js
 node_js: ["0.10"]
 before_script:
-  - npm install -g bower
+  - npm install -g bower gulp
   - bower install
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# angular-zendesk-widget
+# angular-zendesk-widget [![Build Status](https://travis-ci.org/CrossLead/angular-zendesk-widget.svg?branch=master)](https://travis-ci.org/CrossLead/angular-zendesk-widget)
 Angular wrapper for the [Zendesk Web Widget](https://support.zendesk.com/hc/en-us/articles/203908456-Using-Web-Widget-to-embed-customer-service-in-your-website)
 
 ## Installation
diff --git a/package.json b/package.json
@@ -5,6 +5,9 @@
     "name": "McChrystal Group",
     "email": "christian.yang@crosslead.com"
   },
+  "scripts": {
+    "test": "gulp process-all"
+  },
   "dependencies": {},
   "devDependencies": {
     "chai": "^1.9.1",

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# angular-zendesk-widget`
	`1`	`+# angular-zendesk-widget [![Build Status](https://travis-ci.org/CrossLead/angular-zendesk-widget.svg?branch=master)](https://travis-ci.org/CrossLead/angular-zendesk-widget)`
`2`	`2`	`Angular wrapper for the [Zendesk Web Widget](https://support.zendesk.com/hc/en-us/articles/203908456-Using-Web-Widget-to-embed-customer-service-in-your-website)`
`3`	`3`
`4`	`4`	`## Installation`