Merge branch 'master' of git://github.com/poloure/nationstates-linux
Merge branch 'master' of git://github.com/poloure/nationstates-linux
added functional url to the about page
starting to add the view menu
Merge branch 'master' of git://github.com/poloure/nationstates-linux

Conflicts:
	src/nationstates.cc
Merge pull request #12 from errdivideby0/master

merging new file stuff