reverted to old code to remove bug
Merge branch 'master' into order
Merge branch 'master' of https://github.com/kemccabe/betsy_rails
add bootstrap
Merge branch 'master' of https://github.com/kemccabe/betsy_rails