working through chapter 8. Tests currently failing for some reason. Stopped at 8.2.5
upgrade rails
Merge branch 'master' of github.com:blaedj/FuzzySampleApp
update rails and gemfile
merge conflicts
more mrg conflicts
mrgconfl
remove emacs backup file
add blog page, change default font
Merge branch 'blogPage'
add an admin menu, currently usable by all
Merge branch 'adminMenu'
remove landing page links
Merge branch 'adminMenu'
style changes
make the blogs a seperate entity
Continue making blogs a seperate entity
styling
I hate conflicts. Think I'm using Blaed's updates... I hope so...
fixing stupid conflicts