Merge branch 'master' of /Users/bbattis/PycharmProjects/frogsiren with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	frogsiren/routes.py
Added reporting of character info and contract info about an individual contractor