Hideous grouping of sprints. Cold medication.
If I were a beginner I'd refactor it to look like this
this is slightly less horrible
Merge branch 'master' of github.com:myobie/boarderland

Conflicts:
	app/controllers/lists_controller.rb