Playerpicture,
Landmarks
Merge branch 'origin/master'

Conflicts:
	Gemfile.lock
	Modules/Character.rb
	Modules/Charger.rb
	Modules/Event.rb
	Modules/Map.rb
	Modules/NameGen.rb
	Modules/Option.rb
	RandoRealm.rb
	public/Intro.js
	public/chat.js
	views/index.erb