working on controllers
Merge branch 'master' of github.com:maciejsto/JSProject
Merge branch 'master' of github.com:maciejsto/JSProject
from webstorm