no more doc on git
no files under directory
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/documents_controller.rb
	app/views/documents/show.html.erb