develop branch create
adding in files for stories
added in music_app code for stories .erb files
adding in code
Merge branch 'add_new_story' into develop
created index.erb and actions_greg.rb to view all stories
trying to merge
Merge branch 'develop' of github.com:Starlight-Design/midterm into develop
steps is getting there
everything working
Merge branch 'steps' of github.com:Starlight-Design/midterm into style2
now with styling pushed in
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