a lot of small fixes
Delete .index.html.swp
Delete .main.js.swp
Merge branch 'master' of github.com:martelit/arcada-projekt