New
Lol

Signed-off-by: Ivan Chuppin <ivan.chuppin@helsinki.fi>
Merge branch 'master' of ssh://git@github.com/Shinukas/Kreml.git

Conflicts:
	ololo1.txt