setting
Merge branch 'master' of https://github.com/petamoriken/positive-agent

Conflicts:
	news.html
Merge branch 'master' of https://github.com/petamoriken/positive-agent
いったんjQuery入れときます
main etc