backup
Merge branch 'master' of https://github.com/dwicke/bounties

Conflicts:
	Bounties/paper/report.tex