merge with origin/master
Merge remote-tracking branch 'origin/master'

Conflicts:
	.classpath
Merge branch 'master' of git@github.com:YuMatsuzawa/ElectionAnalyzer.git