Massive progress on poster
Merge branch 'master' of github.com:pjbull/civil_conflict
Rename paper folder to proposal
Add older piece of proposal to folder