merged folders, npm install and npm start now works correctly
Merge pull request #142 from antonkandersson/master

merged folders, npm install and npm start now works correctly