initial
Merge branch 'master' of github.com:adelnizamutdinov/temp
fucked up merge