ok...
update ringz
Merge branch 'master' of https://github.com/janitachalam/janitachalam.github.io

"ok"

Conflicts:
	.DS_Store
negotiation menubar
ds
s