reverted to old code to remove bug
Merge branch 'master' into order
Merge branch 'master' of https://github.com/kemccabe/betsy_rails
change to params.
add bootstrap
Merge branch 'master' of https://github.com/kemccabe/betsy_rails
update gem
fix merge conflicts
css so that the layout doesn't drive me totally bats