resolve some merge problem

new.go

@@ -108,7 +108,7 @@ func createApp(cmd *Command, args []string) {
 	writetofile(path.Join(apppath, "views", "index.tpl"), indextpl)
 
 	fmt.Println(path.Join(apppath, "main.go"))
-	writetofile(path.Join(apppath, "main.go"), strings.Replace(maingo, "{{.Appname}}", strings.Join(strings.Split(apppath[len(appsrcpath)+1:], string(path.Separator)), string(path.Separator)), -1))
+	writetofile(path.Join(apppath, "main.go"), strings.Replace(maingo, "{{.Appname}}", strings.Join(strings.Split(apppath[len(appsrcpath)+1:], string(path.Separator)), "/"), -1))
 
 	colorLog("[SUCC] New application successfully created!\n")
 }

test.go

@@ -5,8 +5,6 @@ import (
 	"os/exec"
 	path "path/filepath"
 	"time"
-
-//	"bytes"
 )
 
 var cmdTest = &Command{
@@ -82,15 +80,10 @@ func runTest() {
 
 	var err error
 	icmd := exec.Command("go", "test")
-	//var out,errbuffer bytes.Buffer
-	//icmd.Stdout = &out
-	//icmd.Stderr = &errbuffer
 	icmd.Stdout = os.Stdout
 	icmd.Stderr = os.Stderr
 	colorLog("[TRAC] ============== Test Begin ===================\n")
 	err = icmd.Run()
-	//colorLog(out.String())
-	//colorLog(errbuffer.String())
 	colorLog("[TRAC] ============== Test End ===================\n")
 
 	if err != nil {