Merge branch 'adding-state_machine'
On heroku 2
Merge branch 'master' of github.com:sashkavalent/Ads