Final App Commit Forever. Amen.
Merge branch 'master' of https://github.com/thesoftwarejedi/fishackathon

Conflicts:
	client/isda/www/templates/collect.html