Add functions for generating fake data for testing
Merge conflicts in room-draw.js

Conflicts:
	room-draw.js
Delete old files in data stuff (why is my commit?)