I didnt' do anything particularly special. This paper is not very good!
Added some more stuff to author
Made some comments about my paper writing habits
I want ot be the fist author
Another collaboration
I am the greetest
I don't have any data. Sorry, the "other idiot"
My changes are best
Merge branch 'master' of https://github.com/tonbar/dsc
Merge https://github.com/ben-sanders/SCnowgen

Conflicts:
	journal.txt

Why yes I would like to commit my merge, thank you for asking.