fix conflicts.

application/config/application.php

@@ -140,6 +140,7 @@ return array(
 
 	'aliases' => array(
 		'Auth'       	=> 'Laravel\\Auth',
+		'Authenticator' => 'Laravel\\Auth\\Drivers\\Driver',
 		'Asset'      	=> 'Laravel\\Asset',
 		'Autoloader' 	=> 'Laravel\\Autoloader',
 		'Blade'      	=> 'Laravel\\Blade',

laravel/auth/drivers/driver.php

@@ -5,6 +5,7 @@ use Laravel\Cookie;
 use Laravel\Config;
 use Laravel\Session;
 use Laravel\Crypter;
+use Laravel\Database\Eloquent\Model as Eloquent;
 
 abstract class Driver {
 

laravel/auth/drivers/eloquent.php

@@ -19,6 +19,29 @@ class Eloquent extends Driver {
 	}
 
 	/**
+	 * Login the user assigned to the given token.
+	 *
+	 * The token is typically a numeric ID for the user.
+	 *
+	 * @param  mixed   $token
+	 * @param  bool    $remember
+	 * @return bool
+	 */
+	public function login($token, $remember = false)
+	{
+		// if the token is an Eloquent model get the primary key
+		if ($token instanceof \Eloquent) $token = $token->get_key();
+
+		$this->token = $token;
+
+		$this->store($token);
+
+		if ($remember) $this->remember($token);
+
+		return true;
+	}
+
+	/**
 	 * Attempt to log a user into the application.
 	 *
 	 * @param  array  $arguments