The server is working
Merge branch 'master' of https://github.com/mjs2600/libstatus

Conflicts:
	lib/friend_finder.rb
Merge branch 'master' of https://github.com/mjs2600/libstatus