added json gem
Merge branch 'master' of https://github.com/alexandru-paduraru/razaboi

Conflicts:
	tmp/pids/server.pid