Merge branch 'master' of git://github.com/poloure/nationstates-linux

Conflicts:
	src/gtest.h
added first functional option to menu
Merge branch 'master' of git://github.com/poloure/nationstates-linux

Conflicts:
	src/gtest.cc
Merge pull request #4 from errdivideby0/master

preference menu 1st function