Branch correction
Merge remote-tracking branch 'origin/master'

Conflicts:
	frogsiren/routes.py
Fixed a whoopsie, should be reward, not fee