commit
Merge branch 'master' of https://github.com/palexster/draft

Conflicts:
	paper/draft.pdf
	paper/draft.tex