2013/08/20, 4:59, メニューバー追加
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/com/Erycton/Util/Const.class
	src/com/Erycton/Util/Const.java
	task.txt