Updated Edit function was missing # symbol. added old search fucntion, but still need to convert to jquery
Merge branch 'master' into gh-pages

Conflicts:
	.DS_Store