A simple tas fro the exam
Something taht was not commited and is in conflict now.
Merge branch 'master' of https://github.com/valkirilov/FMI-2013-2014

Conflicts:
	UP/Homeworks/HM-2/a.out
	UP/Homeworks/HM-2/zad2.cpp
Archive for submiting the homework added.