Implemented the DELETE method. Small refactoring on the ifs
Merge branch 'master' of github.com:RuiAAPeres/OctifyPush

Conflicts:
	controller/controller.go
Fixed some merging issues