Merge branch 'steps' of github.com:Starlight-Design/midterm into style2
what
Merge branch 'develop' of github.com:Starlight-Design/midterm into style2
we have steps working!!
yes
Merge branch 'style2' of github.com:Starlight-Design/midterm into steps_working
all working
finally finished
Merge branch 'working2' into develop
final push