Merge branch 'master' of https://github.com/fox-squirrels-2013/potluck into lots_o_shit
because i said so
Fix progress bar bug caused by merge.
Merge branch 'master' of https://github.com/fox-squirrels-2013/potluck into status_bar

Events controller refactoring.
refactor events controller
fix indentation on html
fixed rspec bugs
Merge pull request #34 from fox-squirrels-2013/status_bar

Status bar
last commit
resolve merge conflict
resolved all merge conflicts