before pull
Merge branch 'devel' of https://github.com/rino0601/opencamp3-findthepair into devel

Conflicts:
	src/opencamp/findthepair/Game.java