a
Merge branch 'master' of https://github.com/Pagno/MaguttoManager.git

Conflicts:
	src/Main.java