adding preferences basic menu
forgot to add bin/convert
Merge branch 'master' of git://github.com/poloure/nationstates-linux

Conflicts:
	bin/convert
	bin/nationstates-linux
addition of check boxes in the preference menu
Merge branch 'master' of git://github.com/poloure/nationstates-linux

Conflicts:
	bin/nationstates-linux
added a config file that saves checkbox values.
Merge branch 'master' of https://github.com/errdivideby0/nationstates-linux into errdivideby0-master

Conflicts:
	src/gtest.h