Merge branch 'develop' into 'master'

package-lock.json

package.json

src/App.js

src/components/Convert.js

src/components/Error.js

src/components/Gallery.js

src/components/Login.js

src/components/Main.js

src/components/Navigation.js

src/components/Register.js