updated todo
added modal and edit user account link
added button for favoriting brewskies and moved stuff around on user page
Merge branch 'css2_devise'. We learned how to use Vim today!
added some icons
Merge branch 'css2_devise' .freshened up the passwords page for devise
styled the notice and alert flash messages
styled the notice and alert flash messages
Merge branch 'css2_devise'
Merge branch 'css2_devise'

Conflicts:
	app/views/layouts/application.html.erb
just made a minor change on css
did a little stylee on the navigational bar
app/views/devise/registrations/edit.html.erb
Merge branch 'master' of https://github.com/LiaKitamura/Glass-Over-Flowing

Conflicts:
	app/views/layouts/application.html.erb
cleaned up css a tid bit
something is happening
readded a file somebody may or maynot have accidentally deleted