ya
no
Merge branch 'master' of https://github.com/shaokanp/resty

Conflicts:
	app/views/resources/index.html.erb
	tmp/pids/server.pid