Merge pull request #12 from errdivideby0/master

merging new file stuff
Changing the events_preview section, updated makefile.
commiting changes before merge
Fixed deaths messing up other labels on graphs. DEATHS NOW GRAPH.
Merge branch 'master' of git://github.com/poloure/nationstates-linux

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