add new specs, prep for authentication
fix merge conflicts
fix merge conflicts
Merge branch 'master' of https://github.com/jeffpersonified/spiritcritic
add thin and debugger gems
add devise; migrations have not been run
run devise migrations for users
add admin column (boolean) to user table
add nyan cat formatting for da tests
add spirits#index placeholder, spirits controller, update routes, add temp auth view, and add thin gem
add devise views and before filter on spirits controller
add admin views
tests and style changes
Merge conflicts