created if statement for matching user id to bounty id
Merge branch 'uf-476' of github.com:Webcraft-Myplanet/unicornfactory into uf-464
tallying project info, template changes
started filtering bounties by current user
added current user bounty and bounty user class
number of contributors showing
contributors are showing
deleted some comments
sorting of bounties now includes user bounties
Merge pull request #311 from Webcraft-Myplanet/uf-464

Uf 464
merge conflict fixed
fixed merge conflicts with clean 475
fixed merge and errors
removed bounty test count
fixed indenting
added comments to template.php
Merge pull request #313 from Webcraft-Myplanet/uf-475A

Uf 475 a
fixed merge conflicts