update radius, modify routes to handle modules, add blog module

Gemfile

@@ -6,9 +6,13 @@ gem 'bson_ext'
 gem 'carrierwave'
 gem 'devise'
 gem 'mini_magick'
+<<<<<<< HEAD
 gem 'mongoid'
 
 # gem 'rblog', :path => 'lib/rblog'
+=======
+gem 'mongoid', '2.0.1'
+>>>>>>> 7bdfe52... update radius, modify routes to handle modules, add blog module
 
 # Bundle edge Rails instead:
 # gem 'rails', :git => 'git://github.com/rails/rails.git'