Changes to be committed:
	new file:   app/assets/javascripts/notes.js.coffee
	new file:   app/assets/javascripts/sources.js.coffee
	new file:   app/assets/javascripts/upload.js.coffee
	new file:   app/assets/stylesheets/notes.css.scss
	new file:   app/assets/stylesheets/sources.css.scss
	new file:   app/assets/stylesheets/upload.css.scss
	modified:   app/controllers/application_controller.rb
	new file:   app/controllers/notes_controller.rb
	new file:   app/controllers/sources_controller.rb
	new file:   app/controllers/upload_controller.rb
	modified:   app/helpers/application_helper.rb
	new file:   app/helpers/notes_helper.rb
	new file:   app/helpers/sources_helper.rb
	new file:   app/helpers/upload_helper.rb
	new file:   app/models/data_file.rb
	modified:   app/models/source.rb
	modified:   app/views/layouts/application.html.erb
	new file:   app/views/notes/create.html.erb
	new file:   app/views/notes/destroy.html.erb
	new file:   app/views/notes/index.html.erb
	new file:   app/views/notes/new.html.erb
	new file:   app/views/partials/_legend.html.erb
	new file:   app/views/sources/_source_partial.html.erb
	new file:   app/views/sources/index.html.erb
	new file:   app/views/sources/new.html.erb
	new file: app/views/sources/show.html.erb
	new file: app/views/upload/index.html.erb
	modified: config/routes.rb
	new file: db/migrate/20130228150723_create_data_files.rb
	modified: db/schema.rb
	new file: public/uploads/Propuesta 1.odt
	new file: public/uploads/Resumen - A History of Gaming Platforms: Mattel Intellivision
	new file: test/fixtures/data_files.yml
	new file: test/functional/notes_controller_test.rb
	new file: test/functional/sources_controller_test.rb
	new file: test/functional/upload_controller_test.rb
	new file: test/unit/data_file_test.rb
	new file: test/unit/helpers/notes_helper_test.rb
	new file: test/unit/helpers/sources_helper_test.rb
	new file: test/unit/helpers/upload_helper_test.rb
	modified:   Gemfile
	modified:   Gemfile.lock
	modified:   app/controllers/notes_controller.rb
	modified:   app/controllers/sources_controller.rb
	modified:   app/helpers/application_helper.rb
	modified:   app/models/source.rb
	modified:   app/views/layouts/application.html.erb
	deleted:    app/views/notes/create.html.erb
	deleted:    app/views/notes/destroy.html.erb
	modified:   app/views/notes/index.html.erb
	deleted:    app/views/notes/new.html.erb
	modified:   app/views/sources/_source_partial.html.erb
	modified:   app/views/sources/index.html.erb
	modified:   app/views/sources/new.html.erb
	modified:   app/views/sources/show.html.erb
	new file:   config/cucumber.yml
	modified:   config/database.yml
	modified:   config/routes.rb
	new file:   db/migrate/20130303160806_remove_dir_from_source.rb
	modified:   db/schema.rb
	new file:   features/notes.feature
	new file:   features/sources.feature
	new file:   features/step_definitions/navigation_steps.rb
	new file:   features/step_definitions/note_steps.rb
	new file:   features/step_definitions/sources_steps.rb
	new file:   features/support/env.rb
	new file:   features/support/paths.rb
	new file:   lib/tasks/cucumber.rake
	new file:   public/uploads/Propuesta 1.docx
	new file:   script/cucumber
Merge branch 'master' of https://github.com/fernandohur/tsys

Conflicts:
	Gemfile
	Gemfile.lock
	config/routes.rb
	db/schema.rb
	features/support/paths.rb