Update proposal modal view with rank and score actions
Merge branch 'master' of https://github.com/davidtlee/consensus
Remove protected_attributes gem temporarily
Removed the attr_accessible in mercury image
Updated so modals are correct
10 testers in the rake file
set up orientation cookie stuff
Merge branch 'master' into tour
basic orientation