Delete entries individually
adding edit
Merge branch 'master' of github.com:rharriso/waid into waid_server

Conflicts:
	waid.go