third commit
Merge branch 'master' of https://github.com/brzeszczot/repo_urbs

Conflicts:
	Adds.hpp
	main.cpp
tenth commit