Year comments
merge

Merge branch 'master' of https://github.com/bquast/War_Statebuilding

Conflicts:
	computations.R