title edit
gplus link set
Merge remote-tracking branch 'origin/master'

Conflicts:
	index.htm
Merge branch 'master' of https://github.com/npsystem/npsystem.github.io