controllers and views
Merge branch 'master' of https://github.com/RostovTeam/hackaton