gem setup, server setup
merge master