fixing conflicts.

application/config/application.php

@@ -38,14 +38,24 @@ return array(
 	| remain secret and should not be shared with anyone. Make it about 32
 	| characters of random gibberish.
 	|
-	| The "auto_key" option tells Laravel to automatically set this key value
-	| if one has not already been set. This is generally done on the first
-	| request to the Laravel splash screen.
-	|
 	*/
 
 	'key' => 'YourSecretKeyGoesHere!',
 
+	/*
+	|--------------------------------------------------------------------------
+	| Profiler Toolbar
+	|--------------------------------------------------------------------------
+	|
+	| Laravel includes a beautiful profiler toolbar that gives you a heads
+	| up display of the queries and logs performed by your application.
+	| This is wonderful for development, but, of course, you should
+	| disable the toolbar for production applications..
+	|
+	*/
+
+	'profiler' => true,
+
 	/*
 	|--------------------------------------------------------------------------
 	| Application Character Encoding
@@ -140,6 +150,7 @@ return array(
 		'Log'        => 'Laravel\\Log',
 		'Memcached'  => 'Laravel\\Memcached',
 		'Paginator'  => 'Laravel\\Paginator',
+		'Profiler'   => 'Laravel\\Profiling\\Profiler',
 		'URL'        => 'Laravel\\URL',
 		'Redirect'   => 'Laravel\\Redirect',
 		'Redis'      => 'Laravel\\Redis',
@@ -157,4 +168,4 @@ return array(
 		'View'       => 'Laravel\\View',
 	),
 
-);
+);

application/routes.php

@@ -35,6 +35,12 @@
 
 Route::get('/', function()
 {
+	Config::set('database.connections.mysql.password', 'password');
+	Config::set('database.connections.mysql.database', 'bundler');
+	DB::table('users')->get();
+	DB::table('users')->where_id(1)->first();
+	DB::table('users')->where_in('id', array(1, 2, 3))->get();
+	Log::error('Something went wrong!');
 	return View::make('home.index');
 });
 

application/start.php

@@ -154,4 +154,4 @@ date_default_timezone_set(Config::get('application.timezone'));
 if ( ! Request::cli() and Config::get('session.driver') !== '')
 {
 	Session::load();
-}
+}