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
Added committing system and upgraded acts_as_commentable to acts_as_commentable_with_threading

Create partial for with a form for entering lesson comments

	modified:   Gemfile
	new file:   app/assets/javascripts/comments.js.coffee
	new file:   app/assets/stylesheets/comments.css.scss
	new file:   app/controllers/comments_controller.rb
	modified:   app/controllers/lessons_controller.rb
	new file:   app/helpers/comments_helper.rb
	new file:   app/models/comment.rb
	modified:   app/models/lesson.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/topic.rb
	modified:   app/models/user.rb
	new file:   app/views/lessons/_form.html.erb
	new file:   app/views/lessons/_relateds.html.erb
	new file:   app/views/lessons/edit.html.erb
	new file:   app/views/lessons/index.html.erb
	new file:   app/views/lessons/new.html.erb
	new file:   app/views/lessons/show.html.erb
	new file:   app/views/lessons/show.js
	new file:   app/views/shared/_comform.html.erb
	new file:   app/views/topics/index.html.erb
	new file:   app/views/topics/new.html.erb
	new file:   app/views/topics/show.html.erb
	modified:   config/environment.rb
	modified:   config/environments/development.rb
	new file:   config/initializers/merit.rb
	modified:   config/routes.rb
	new file:   config/sunspot.yml
	new file:   db/migrate/20131207214000_create_merit_actions.rb
	new file:   db/migrate/20131207214001_create_merit_activity_logs.rb
	new file:   db/migrate/20131207214002_create_sashes.rb
	new file:   db/migrate/20131207214003_create_badges_sashes.rb
	new file:   db/migrate/20131207214004_create_scores_and_points.rb
	new file:   db/migrate/20131207214019_add_fields_to_users.rb
	new file:   db/migrate/20131207234247_create_comments.rb
	new file:   db/migrate/20131208014332_acts_as_commentable_upgrade_migration.rb
	modified:   db/schema.rb
	new file:   test/functional/comments_controller_test.rb
	new file:   test/unit/helpers/comments_helper_test.rb
Merge branch 'dk-working' of https://github.com/davemess/Guithub into dk-working

Conflicts:
	Guithub/Gemfile
	Guithub/Gemfile.lock
	Guithub/app/models/merit/badge_rules.rb
	Guithub/app/views/audio_lessons/show.html.erb
	Guithub/config/initializers/merit.rb
	Guithub/db/schema.rb
	Guithub/db/seeds.rb
Add badges tab to profile page
Add new badge icons
Fixed display bug
Added Code to handle students that haven't earned any badges
	modified:   app/models/lesson.rb
	modified:   app/models/merit/badge_rules.rb
	modified:   app/views/lessons/show.html.erb
	new file:   app/views/shared/_user_badges.html.erb
	modified:   app/views/user_badges/index.html.erb
	modified:   app/views/users/registrations/edit.html.erb
	modified:   config/environment.rb
	modified:   config/environments/development.rb
	modified:   config/initializers/merit.rb
	modified:   config/routes.rb
	new file:   public/images/badges/.directory
	new file:   public/images/badges/building.png
	new file:   public/images/badges/guitar.png
	new file:   public/images/badges/head_phones.png
	new file:   public/images/badges/keyboard.png
	new file:   public/images/badges/mic.png
	new file:   public/images/badges/on_fire.png
	new file:   public/images/badges/record.png
	new file:   public/images/badges/single_note.png
	new file:   public/images/badges/speaker.png
	new file:   public/images/badges/talking.png
Merge branch 'dm-working'
Merge branch 'dm-working'
Photo Spud Added
Cleaned up test code
Merge branch 'dk-merge-bu' into master-bu

Conflicts:
	Guithub/Gemfile
	Guithub/Gemfile.lock
	Guithub/app/models/lesson.rb
	Guithub/app/views/Lessons/show.js
	Guithub/app/views/lessons/show.js
	Guithub/app/views/lessons/show.js.erb
	Guithub/db/schema.rb
merge
fixed merge conflicts
fixed gemfile.lock
Merge branch 'master-bu' into dm-working