1212
Merge branch 'master' of https://github.com/kma0919/mina1.git

Conflicts:
	src/mina1/mina1.java