sorry for mistaking of commit!
Please ignore this commit!chotto commit ga yakkaidatta!

Merge remote-tracking branch 'origin/master'

Conflicts:
	15_Facade/main/Main.java
	15_Facade/main/maildata.txt
	15_Facade/main/pagemaker/Database.java
	15_Facade/main/pagemaker/HtmlWriter.java
	15_Facade/main/pagemaker/PageMaker.java
	15_Facade/pactice/Main2.java