Julio's change
Merge branch 'master' of github.com:Jonathan3145/papers into junk

Conflicts:
	journal.txt