Last good revision
Merge branch 'master' of https://github.com/janvmusic/Ruby

Conflicts:
	HardWay/projects/gothonweb_final/lib/gothonweb_final.rb
	HardWay/projects/gothonweb_final/lib/map.rb
	HardWay/projects/gothonweb_final/lib/views/show_room.erb
Added some fixes