created a service list
started sevice functions

Conflicts:
	config/database.yml
	config/routes.rb
	log/development.log
	tmp/pids/server.pid