Setting up environment on  linux machine
Merge branch 'ThreeJS' of https://github.com/tufts-LPC/Trails-Forward-server into ThreeJS

Conflicts:
	Gemfile
	Gemfile.lock
	config/initializers/devise.rb
Merge branch 'ThreeJS' of https://github.com/tufts-LPC/Trails-Forward-server into ThreeJS
updated animal class, added woodcock
Merge branch 'ThreeJS' of https://github.com/tufts-LPC/Trails-Forward-server into ThreeJS

Conflicts:
	db/schema.rb
Added error handling for websocket manager and put animal simulation in world tick