new styles
main.js
Merge branch 'master' of https://github.com/dioklecijan/FirstProject
new templates