Add rails_bootstrap_navbar to Gemfile
Be sure to `bundle install`
Gemfile.lock edited due to `bundle install`, remove old navbar
Reindent application.html.erb
Add navbar with horrible indentation
RHTML Mode cannot seem to handle this code correctly.
@cg505 How important is it that the text is not in the collapse portion?  This code generates it to be collapsed as well, and I am wondering how necessary it is to have it outside of the collapse portion.
Slightly better indentation
Manually correct indentation
I turned to gedit to fix it.  Does anybody has an Emacs configuration that can handle indenting this correctly?
Remove stupid file, add temporary prevention to .gitignore
Remove nav_link method
Silly indentation change
Rename application.css -> application.css.scss, add to .gitignore
Retabify application.css
Merge branch 'master' of github.com:kotct/docket
Take navbar out of container
Merge branch 'rails-bootstrap-navbar', fixes #1
Merge branch 'master' of github.com:kotct/docket
Reindenting (this may be incorrectly reindented)
Merge branch 'master' of github.com:kotct/docket

Conflicts:
	app/assets/stylesheets/application.css.scss
Retab application.css.scss
Indefinite articles!