nilofer

services
Merge branch 'master' of https://github.com/mayukhroy/vms

Conflicts:
	app/views/services/index.html.erb