test pus
add google plus
Merge branch 'master' of https://github.com/akiraliu/ossf

Conflicts:
	world.rb