merge
merge
merge
merge
layout changes
add more styling
cleaning up
clean up merge conflicts
add resque redis stuff
change application file
adjust resque file
comment out possibly bad code
add config stuff to production.rb
delete development.rb config
more css
change redirect route
reconfigure redirect
troubleshooting redis
more redis
Merge branch 'master' of https://github.com/skwak/p-patch-PowderBlue