a5
Merge branch 'master' of https://github.com/mpreis/lop

Conflicts:
	ps/task_02/a4.pl
	ps/task_2/a4.pl
	ps/task_2/a5.pl