Closed ivov closed 4 years ago
Closes #36
Merge conflict solved for imports and routes in App.js.
App.js
Merge conflicts resolved
Closes #36