add migration for child sti in users table
create dashboard for parent adding
add link_to for parent admin
create sti relationship for parent and child
create models for parent and child
add name assignment functionality
add items wip
Merge remote-tracking branch 'origin/parent_child_sti' into parent_add_task
add form validations for add tasks
loot limit functionality added and flash error messages
Merge remote-tracking branch 'origin/convert_name' into parent_add_task

Conflicts:
	app/views/users/create.html.haml
	app/views/users/show.html.haml
	config/routes.rb
project rebrand
project rebrand renaming
treasure model testing
testing for merge
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
rename migration and spec test
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
fix UsersHelper by wrapping it in a module
delete parent controller spec file that is not being used
delete files that are not being used