gemfile for the server
Merge branch 'master' of https://github.com/VT-CHCI/VR_kbase

Conflicts:
	Gemfile