+friction
Merge branch 'master' of https://github.com/MaxMyalkin/tp_2014_02_frontend_Myalkin_Chernobrovkin