fixed lesson topic display
Merge branch 'dm-working'
removed MediaItem
added Paperclip file uploading to AudioLesson
updated seed file
Merge branch 'dm-working'
removed MediaItem migrations
format seeds.rb
seeded Users: 4 students and 1 instructor
Cleaning up User Account Details page
Added tabs to Account Details Page
Merge branch 'dm-working'
Installed and configured the Merit Gem
Add a view to display users earned badges
	modified:   Gemfile
	new file:   app/assets/javascripts/user_badges.js.coffee
	new file:   app/assets/stylesheets/user_badges.css.scss
	new file:   app/controllers/user_badges_controller.rb
	new file:   app/helpers/user_badges_helper.rb
	new file:   app/models/merit/badge_rules.rb
	new file:   app/models/merit/point_rules.rb
	new file:   app/models/merit/rank_rules.rb
	modified:   app/models/user.rb
	modified:   app/views/audio_lessons/show.html.erb
	new file:   app/views/user_badges/index.html.erb
	new file:   config/initializers/merit.rb
	new file:   db/migrate/20131126151908_create_merit_actions.rb
	new file:   db/migrate/20131126151909_create_merit_activity_logs.rb
	new file:   db/migrate/20131126151910_create_sashes.rb
	new file:   db/migrate/20131126151911_create_badges_sashes.rb
	new file:   db/migrate/20131126151912_create_scores_and_points.rb
	new file:   db/migrate/20131126152324_add_fields_to_users.rb
	modified:   db/schema.rb
	modified:   db/seeds.rb
	new file:   public/images/on_fire.png
	new file:   test/functional/user_badges_controller_test.rb
	new file:   test/unit/helpers/user_badges_helper_test.rb