fix error when clicking username link for user with no proposals
fix merge conflict
Fix gemfile
Merge pull request #115 from billsaysthis/fix-username-no-proposals-link-feb13

fix error when clicking username link for user with no proposals
Merge pull request #120 from tispratik/fix_gemfile_feb13

Fix gemfile