Merge branch 'master' of https://github.com/jaredborner/lacc

Conflicts:
package.json
resolving merge conflict in package.json