main.js added
Merge branch 'lab'