WIP
Merge branch 'master' of github.com:heathered/task-project

Conflicts:
	Gemfile.lock
bundle install
Pages Controller
Merge branch 'master' of github.com:heathered/task-project

Conflicts:
	config/routes.rb
Add root route
Merge branch 'master' of github.com:heathered/task-project