Added Simple_form, pulled out devise so we can show everyone how to use it from the start, updated to 3.2.16
devise
nav bar
clean
Merge branch 'master' of github.com:Plummat/gaprojecttwo into zumbalogy
saving songs and combos seems to work
Merge branch 'master' of github.com:Plummat/gaprojecttwo
forgot to fill in a few song attr saves
Front end nav bar broken
building navbar
Merge branch 'master' of github.com:Plummat/gaprojecttwo
Removed question mark from line 21 in controllers/main_controller.rb. Front end is running again.
Site looks ok. Working on sticking footer to bottom of page
footer's sticking to the bottom of the page
Merge branch 'master' of github.com:Plummat/gaprojecttwo
Merge branch 'master' of github.com:Plummat/gaprojecttwo