update, delete
Merge branch 'master' of https://github.com/rousojohn/webApp

Conflicts:
	server/index.php