initial repo
Merge branch 'master' of https://github.com/umeike/JavaSite

Conflicts:
	.gitignore