logic
Merge branch 'master' of github.com:seijiro/janken

Conflicts:
	src/main/Director.java
	src/main/module/HistoryBuilder.java