--

Signed-off-by: Eugene Dimitrow <e.dimitrow@gmail.com>
Merge branch 'master' of https://github.com/dimitrow/Diploma