new
delete
Merge branch 'master' of https://github.com/MWBKris/apigee

Conflicts:
	www/index.html