# This is a combination of 7 commits.
# The first commit's message is:
Devise installed

# This is the 2nd commit message:

Views for devise was generated. Sign in/Sign out/Sign up/Edit profile buttons was added to navbar

# This is the 3rd commit message:

All devise views converted to slim

# This is the 4th commit message:

Devise templates fix

# This is the 5th commit message:

Yet another devise templates fix

# This is the 6th commit message:

Devise views style fixes

# This is the 7th commit message:

All forms now using bootstrap
Merge branch 'master' of https://github.com/zhulik/GreenRails

Conflicts:
	Gemfile.lock
	app/controllers/messages_controller.rb