Readme file
Merge branch 'master' of github.com:lisajwells/wdi_project_three
Fixed gemfile issues with haml
Merge branch 'master' of github.com:lisajwells/wdi_project_three
freeday trial
Trying again
Merge branch 'master' of github.com:lisajwells/wdi_project_three
solving merge conflict
Trying heroku again
Merge branch 'master' of github.com:lisajwells/wdi_project_three
Trying heroku again
Merge branch 'master' of github.com:lisajwells/wdi_project_three
Added to the index, added join page
Trying this commit again
Merge conflicts fixed
made changes