.
Merge branch 'master' of https://github.com/SkidanovAlex/angelhack2