Repair ordiring
Merge branch 'master' of github.com:pdostal/pinger

Conflicts:
	app/controllers/services_controller.rb