nbadakh

Results 3 comments of nbadakh

\- Attached screenshots: ![landscape_horizontal_axis](https://user-images.githubusercontent.com/41149587/43147273-4864a4f0-8f80-11e8-8240-0948d5d72a9a.png) ![portrait_vertical_axis](https://user-images.githubusercontent.com/41149587/43147275-48a384d6-8f80-11e8-9a6d-b9db22e8ee8e.png)

Fixed merge conflicts.