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

Conflicts:
	src/figureFk/F4kSolution.java
	src/hanoi/simulation/Simulation.java
	src/hanoi/view/HanoiView.java