Allowed access and editing to colour for graph through text config files.
Merge branch 'master' of https://github.com/poloure/nationstates-linux

Conflicts:
	src/nationstates.cc