fixed merge conflicts.

changelog.md

 # Laravel Change Log
 
+## Version 1.5.8
+
+- Fixed bug in form class that prevent name attributes from being set properly.
+
+### Upgrading from 1.5.7
+
+- Replace **system** directory.
+
 ## Version 1.5.7
 
 - Fixed bug that prevented view composers from being called for module named views.

public/index.php

@@ -45,4 +45,4 @@ $public      = __DIR__;
 */
 require $laravel.'/laravel.php';
 
-echo (microtime(true) - START_TIME) * 1000;
\ No newline at end of file
+echo (microtime(true) - START_TIME) * 1000;