RSpec added

Conflicts:

	Gemfile.lock
specs for FilesController