Setup to resolve merge conflicts.
Merge pull request #34 from rickarubio/refactor_js

Setup to resolve merge conflicts.