Merge branch 'master' of https://github.com/alexandrovsky/bad_trip