formatted code
added DELETE
fixed gitignore
Merge branch 'master' of github.com:miguelarca/grubbing

Conflicts:
	.gitignore
	grubbingapp-openshift.yml