maj
Merge branch 'master' of github.com:bloodmaker/MiniP-MD

Conflicts:
	src/figureFk/Main.java
	src/hanoi/main/Main.java