Merge master

npm-debug.log

@@ -1,34 +0,0 @@
-0 info it worked if it ends with ok
-1 verbose cli [ '/usr/local/Cellar/node/4.1.2/bin/node',
-1 verbose cli   '/usr/local/bin/npm',
-1 verbose cli   'run',
-1 verbose cli   'lint' ]
-2 info using npm@2.14.6
-3 info using node@v4.1.2
-4 verbose stack Error: Failed to parse json
-4 verbose stack Unexpected token '<' at 33:1
-4 verbose stack <<<<<<< Updated upstream
-4 verbose stack ^
-4 verbose stack     at parseError (/usr/local/lib/node_modules/npm/node_modules/read-package-json/read-json.js:379:11)
-4 verbose stack     at parseJson (/usr/local/lib/node_modules/npm/node_modules/read-package-json/read-json.js:68:23)
-4 verbose stack     at /usr/local/lib/node_modules/npm/node_modules/read-package-json/read-json.js:48:5
-4 verbose stack     at /usr/local/lib/node_modules/npm/node_modules/graceful-fs/graceful-fs.js:76:16
-4 verbose stack     at FSReqWrap.readFileAfterClose [as oncomplete] (fs.js:380:3)
-5 verbose cwd /Users/harry/sites/transloadit-js-client
-6 error Darwin 15.0.0
-7 error argv "/usr/local/Cellar/node/4.1.2/bin/node" "/usr/local/bin/npm" "run" "lint"
-8 error node v4.1.2
-9 error npm  v2.14.6
-10 error file /Users/harry/sites/transloadit-js-client/package.json
-11 error code EJSONPARSE
-12 error Failed to parse json
-12 error Unexpected token '<' at 33:1
-12 error <<<<<<< Updated upstream
-12 error ^
-13 error File: /Users/harry/sites/transloadit-js-client/package.json
-14 error Failed to parse package.json data.
-14 error package.json must be actual JSON, not just JavaScript.
-14 error
-14 error This is not a bug in npm.
-14 error Tell the package author to fix their package.json file. JSON.parse
-15 verbose exit [ 1, true ]

src/js/lib/transloadit-js-client.js

@@ -0,0 +1,9 @@
+window.Transloadit = function (selector) {
+  var el    = document.querySelector(selector);
+  var inner = ''
+  inner += '<div class="transloadit-js-client">';
+  inner += 'Hello world :)';
+  inner += 'I am the new Transloadit js client, and as you can see, I need to be improved badly :)';
+  inner += '</div>';
+  el.innerHTML = inner;
+};

src/scss/index.scss

@@ -0,0 +1,6 @@
+.transloadit-js-client {
+  font-family : "Comic Sans MS";
+  color       : purple;
+  border      : 1px dashed pink;
+  font-size   : 32px;
+}