fiddling with bootstrap
fix application file merge
bootstrap nav bar, hell yeah
Merge branch 'master' of https://github.com/kemccabe/betsy_rails
Merge branch 'order'