Integration tests green
add .travis.yml for travis.ci
add .travis.yml for travis.ci
move .travis.yml to root
update travis.yml file
Tasks MVP finished
Added it back since it had been deleted
	new file:   app/assets/javascripts/application.js

Finished adding task resource methods
	new file:   app/controllers/tasks_controller.rb

Added to_params method so that you don't have to type @captain.username everywhere
	modified:   app/models/captain.rb

Added validations and relations
	new file:   app/models/task.rb

A form partial for new and editing tasks
	new file:   app/views/tasks/_form.html.haml

View for edit page
	new file:   app/views/tasks/edit.html.haml

	new file:   app/views/tasks/index.html.haml

  new file:   app/views/tasks/new.html.haml
	new file:   app/views/tasks/show.html.haml

Nested tasks within Captain routes
	modified:   config/routes.rb
Merge branch 'master' into treasure_testing
Merge remote-tracking branch 'origin/add_task_ken' into treasure_testing

Conflicts:
	app/assets/javascripts/application.js
	config/routes.rb