new file:    .travis.yml
	modified:   app/assets/stylesheets/application.css
	new file:   app/assets/stylesheets/application.css~
	modified:   app/assets/stylesheets/tasks.css.scss
	modified:   app/controllers/tasks_controller.rb
	modified:   app/views/categories/index.html.erb
	modified:   app/views/layouts/application.html.erb
	modified:   app/views/tasks/index.html.erb