Merge pull request #84 from AntonShevchuk/master

Fixed code style of application
Fixed main.js
Merge pull request #85 from The-Who/master

Fixed main.js