can add file to the task
add name to page task
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/projects_controller.rb
	app/views/projects/index.html.erb
	app/views/tasks/_task_table.html.erb
	app/views/tasks/index.html.erb
can add file to the task
add name to page task
can add file to the task
add name to page task