Master is now just release
Updated README - we'll see how G-F MD does...
Updated TODO list
Merge branch '2.0.0' of https://github.com/MiltonStanley/Quandrax into 2.0.0

Conflicts:
	C++/.gitattributes
	C++/.gitignore
	C++/include/player.h
	C++/include/province.h
	C++/include/world.h
	C++/lib/.provMap.cpp
	C++/lib/provMap1.cpp
	C++/makefile
	C++/player.cpp
	C++/province.cpp
	C++/quandrax.cpp
	C++/test/hashconv.cpp
	C++/test/rulers.cpp
	C++/tools/parser.rb
	C++/world.cpp
	ChangeLog.txt
	Development/Ruby/lib/template.eu3
	Ruby/lib/prov_map.rb
	Ruby/lib/tag_map.rb
	Ruby/lib/template.eu3
	Ruby/quandrax.rb
	Ruby/samples/test.rb
	lib/prov_map.rb
	lib/tag_map.rb
	lib/template.eu3
	quandrax.rb