added a 2 in line 124 (test)
Merge https://github.com/poloure/nationstates-linux

Conflicts:
	src/saveview.cc
reverting change maybe?
Merge pull request #2 from errdivideby0/master

testing2