From 35490a68fc4587f1aa4139effd39c6ef711de84f Mon Sep 17 00:00:00 2001
From: pswietojanski <p.swietojanski@gmail.com>
Date: Sun, 1 Nov 2015 16:49:35 +0000
Subject: [PATCH] Merge branches 'lab4_solved' and 'master'