Test commit
Merge branch 'master' of ssh://git@github.com/alexandrovsky/bad_trip.git
cleanup class
cleanup class structure