Init project
Merge branch 'branch1' of https://github.com/modibixa/Test1 into branch1
Update JS