Final version
Merge branch 'master' of https://github.com/stawny/studies.git

Conflicts:
	i_term/algorithmic_techniques/assignment1/src/Machine.java