commiting changes before merge
Merge branch 'master' of git://github.com/poloure/nationstates-linux

Conflicts:
	src/nationstates.cc
Merge branch 'master' of git://github.com/poloure/nationstates-linux
Merge pull request #14 from errdivideby0/master

merging