updated first function
Merge branch 'master' of https://github.com/schulthe/inf1340_2014_asst2

Conflicts:
	papers.py
Merge branch 'master' of https://github.com/schulthe/inf1340_2014_asst2

Conflicts:
	papers.py
rough skeleton of second function
Merge remote-tracking branch 'origin/master'
went through body of function
went through body of function