ひな形完成
Merge branch 'master' of github.com:mtfuji/rails3_template

Conflicts:
	.gitignore
	README.md