Issue #186 confuring files
Merge branch 'master' C2_magdi_186_post_a_reply_1.14
Issue #185 #186 #187 CRUD for reply still not fully working
Merge branch 'master' into C2_magdi_186_post_a_reply_1.14
Merge branch 'master' into C2_magdi_186_post_a_reply_1.14

Conflicts:
	tutor/config/routes.rb
	tutor/db/seeds.rb
trying doing ajax
trying to run ajax
Merge branch 'master' into C2_magdi_186_post_a_reply_1.14

Conflicts:
	tutor/db/seeds.rb
reconfiugeing views
changing something
checking database
Issue #186 adding documentation
Issue #186 configuring ajax
Issue #186 fixing conflice
Fixing
fixing
Hoping to remove Gemfile.lock
Merge branch 'master' into C2_magdi_186_post_a_reply_1.14

Conflicts:
	tutor/config/routes.rb
	tutor/db/seeds.rb
merging from master
Issue #186 fixing creating