From 55d02cf6d87caea72edd2c383d72ac658bf6b888 Mon Sep 17 00:00:00 2001
From: Steve Heffernan <steve@zencoder.com>
Date: Tue, 11 Dec 2012 14:33:42 -0800
Subject: [PATCH] Added .editorconfig and travis CI badge

---
 .editorconfig | 11 +++++++++++
 README.md     |  3 +--
 2 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100644 .editorconfig

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 000000000..d36ec3211
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,11 @@
+# editorconfig.org - unify code style
+# plugins for text editors: editorconfig.org/#download
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
\ No newline at end of file
diff --git a/README.md b/README.md
index aa16d77ab..810ebe357 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,5 @@
-VideoJS - [HTML5 Video Player](http://videojs.com)
+[Video.js - HTML5 Video Player](http://videojs.com)[![Build Status](https://travis-ci.org/zencoder/video-js.png?branch=master)](https://travis-ci.org/zencoder/video-js)
 ==================================================
-Version 3.0 BETA
 
 Visit the main site at [videojs.com](http://videojs.com) for download options and instructions.