undo unwanted changes in master after branching
Merge branch 'master' of github.com:fant0mex/DIAS_
slick in js