Merge pull request #14 from errdivideby0/master

merging
Flags now saved
Flag auto-resizing.
Merge branch 'master' of https://github.com/poloure/nationstates-linux
Merge pull request #16 from errdivideby0/master

merging with new view menu features
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
Added colour files, merge fixes.
added a semi-functional color choosing section in the prefernces menu