updates
did a git rm index.html because of conflict. hope that was the right thing to do.
Merge branch 'master' of https://github.com/bsale/jBookmarks

Conflicts:
	index.html