incorrect commit!
many updates!
incorrect commit!
many updates!
Merge branch 'new' into working_copy

* new:
  many updates!
  incorrect commit!
  made server.js point to build
overwrite Master with working branch
Merge branch 'master' into working_copy
Replaced master with working copy branch

Back on master and with all my changes thank god!