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

Conflicts:
	css/style.css
Merge branch 'master' of https://github.com/petamoriken/positive-agent

Conflicts:
	index.html
	login2.html
	news.html