CSS Improvements
Merge branch 'master' of https://github.com/CodedBeardedSignedTaylor/EverythingIsRuby

Conflicts:
	app/assets/javascripts/user/sessions.js.coffee
	app/assets/stylesheets/custom.css.scss
	app/controllers/basic_page_controller.rb
	app/helpers/admin/sessions_helper.rb
	app/helpers/user/sessions_helper.rb
	app/models/ability.rb
	app/views/basic_page/about.html.erb
	app/views/basic_page/index.html.erb
	app/views/devise/confirmations/new.html.erb
	app/views/devise/mailer/confirmation_instructions.html.erb
	app/views/devise/mailer/reset_password_instructions.html.erb
	app/views/devise/mailer/unlock_instructions.html.erb
	app/views/devise/passwords/edit.html.erb
	app/views/devise/passwords/new.html.erb
	app/views/devise/registrations/edit.html.erb
	app/views/devise/registrations/new.html.erb
	app/views/devise/sessions/new.html.erb
	app/views/devise/shared/_links.erb
	app/views/devise/unlocks/new.html.erb
	app/views/posts/edit.html.erb
	app/views/posts/new.html.erb
	config/initializers/devise.rb
	config/locales/devise.en.yml
	config/routes.rb
	db/migrate/20140618140006_devise_create_users.rb
	db/migrate/20140618160924_add_username_to_users.rb
	db/migrate/20140624183822_add_role_to_users.rb
	spec/controllers/admin/sessions_controller_spec.rb
	spec/controllers/user/sessions_controller_spec.rb
Merging fixes and Server Repair