Updated version with different structure
Merge branch 'master' of https://github.com/anneventures84/inf1340_2014_asst2

Conflicts:
	papers.py