Revert "Merge branch 'master' of https://github.com/goelalex/inf1340_2014_asst2"

This reverts commit 1d60e2963fdf3a53d9c63c28805abe7e1d915aaf, reversing
changes made to ff6df7c137c6011e993531fa127f28dc0ae44c62.
Merge branch 'master' of https://github.com/goelalex/inf1340_2014_asst2

Conflicts:
	papers.py
Revert f46d166..2ee48ec

This rolls back to commit f46d166a72785f0eebe92c71cbd432a9c4df2fa8.