Reorg into 2 seperate directories so I can concetrate on the right thing for the right dir
reorganization
Merge branch 'master' of github.com:anithri/game_maker into reorg

Conflicts:
	game_master/lib/game_master.rb
	game_master/lib/game_master/game.rb
	streets_of_gotham/game_config.yml
synced between work and home