started doing modal window, mask is ready
Merge branch 'master' of https://github.com/Chipman/ourProject
continue creating modal slider
Merge branch 'master' of https://github.com/Chipman/ourProject
finished main code for modal slider
finished resolving conflicts