devise installed. signup, edit account, login, logout
arhhhh
Stuffthats changes facebook on rails imi workspace xml
Merge branch 'master' of github.com:rugsta/facebook_on_rails

Conflicts:
	.idea/.rakeTasks
	.idea/workspace.xml
	app/views/devise/registrations/edit.html.erb
	app/views/devise/registrations/new.html.erb
	app/views/devise/sessions/new.html.erb
	app/views/layouts/_header.html.erb
	config/environments/development.rb
	config/initializers/devise.rb