commit to merge client
resolve minor conflict
delete failing package.json to renew; add npm bug log for review on other machine
delete all files for fresh start; reset for npm bug
delete all files for fresh start; reset for npm permissions and parsing bug