Improve sidebar style and begin drag-and-drop
Merge branch 'master' into client-sidebar
Merge branch 'attack' into client-sidebar
Merge branch 'attack' into client-sidebar
Drag and drop creatures into the game
Set placed creatures at the correct tile
Creature class ID is passed correctly through drag+drop
New grass texture
Merge branch 'master' into client-sidebar

Conflicts:
	public/client/biogame.js
	world/world.js
changed water, rock, and sand
added stone
Un-hardcoded map, instead reads synchronously from a JSON file
socket fixed
Merge branch 'client' of github.com:rit-sse/rapdev12 into client
fix websocket url to location.host
Effects stuff, still working on making them show up in the right place reliably
Merge branch 'client' of https://github.com/rit-sse/rapdev12 into test_merge

Conflicts:
	comm/index.js

Resolved.
Merge branch 'client-sidebar' of https://github.com/rit-sse/rapdev12 into test_merge
little bits
Merge remote-tracking branch 'origin' into test_merge