Merge branch 'cp-delete-review' into CP_foundations
remove <<<< HEAD
Merge remote-tracking branch 'origin' into cp_foundations
assigned variables to fix spec
resolve merge conflict
refactoring forms
edit controller needed @bus
panel around title
resolve merge conflict
remove bottom margin
header title
resolve merge conflict
oops
Merge remote-tracking branch 'origin' into cp_foundations
new index heading and explanation text
attempting to get arrow icons
switch order
nag bar image
Format edits.
All. The. Buses.