ShareCommit@taka345
Merge branch 'master' of https://github.com/taka345/ShareGit

Conflicts:
	src/informationManager/Sample/InformationManager.java
2014/12/23