asdf
Merge branch 'master' of https://github.com/Elejdor/mn_2014

Conflicts:
	Zadanie_1/Zadanie_1/Add1.hpp
	Zadanie_1/Zadanie_1/Functions.hpp