testing testing
Merge branch 'master' of https://github.com/LM2is213-76070-v14/LM.git

Conflicts:
	LM/src/lm/Main.java
Ny output