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

Conflicts:
	src/preferences.cc
Merge branch 'master' of git://github.com/poloure/nationstates-linux
Create gh-pages branch via GitHub
Update index.html
Merge branch 'gh-pages' of git://github.com/poloure/nationstates-linux
added the about menu option.
attempted to add a link to github page in the about.

attempt failed...
Merge pull request #5 from errdivideby0/master

added about menu