Fix unresolved conflicts in gitignore, readme and en-version of the book

.gitignore

@@ -2,7 +2,3 @@
 pkg/*
 *.html
 *.exe
-<<<<<<< HEAD
-=======
-
->>>>>>> eead24cf064976b648de5826eab51880c803b0fa

.gitignore.orig

@@ -1,8 +0,0 @@
-*~
-pkg/*
-*.html
-*.exe
-<<<<<<< HEAD
-=======
-
->>>>>>> eead24cf064976b648de5826eab51880c803b0fa

README.md.orig

@@ -1,46 +0,0 @@
-# Multiple Language Versions
-<<<<<<< HEAD
-=======
-* [English](en/)
->>>>>>> eead24cf064976b648de5826eab51880c803b0fa
-* [French](fr/)
-* [Spanish](es/)
-* [中文](zh/)
-* [日本語](ja/)
-* [Turkish](tr/)
-* [Português - Brasil](pt-br/)
-* [German](de/)
-* [Русский](ru/)
-
-# Donate
-
-AliPay: <img src="zh/images/alipay.png" alt="alipay" width="100" height="100">
-
-English Donate:[donate](http://beego.me/donate)
-
-## Community
-QQ群：148647580
-
-BBS：[http://golanghome.com/](http://golanghome.com/)
-
-## Acknowledgments
-
- - [四月份平民](https://plus.google.com/110445767383269817959) (review代码)
- - [Hong Ruiqi](https://github.com/hongruiqi) (review代码)
- - [BianJiang](https://github.com/border) (编写go开发工具Vim和Emacs的设置)
- - [Oling Cat](https://github.com/OlingCat)(review代码)
- - [Wenlei Wu](mailto:spadesacn@gmail.com)(提供一些图片展示)
- - [polaris](https://github.com/polaris1119)(review书)
- - [雨痕](https://github.com/qyuhen)(review第二章)
-
-<<<<<<< HEAD
-=======
-Translator:
- - [LarryBattle](https://github.com/LarryBattle)
->>>>>>> eead24cf064976b648de5826eab51880c803b0fa
-## License
-Book License: [CC BY-SA 3.0 License](http://creativecommons.org/licenses/by-sa/3.0/)
-
-Code License: [BSD 3-Clause License](<https://github.com/astaxie/build-web-application-with-golang/blob/master/LICENSE.md>)
-
-

en/13.5.md

@@ -127,11 +127,7 @@ func (this *EditController) Get() {
 	id, _ := strconv.Atoi(this.Ctx.Params[":id"])
 	this.Data["Post"] = models.GetBlog(id)
 	this.Layout = "layout.tpl"
-<<<<<<< HEAD
-	this.TplNames = "new.tpl"
-=======
 	this.TplNames = "edit.tpl"
->>>>>>> eead24cf064976b648de5826eab51880c803b0fa
 }
 
 func (this *EditController) Post() {
@@ -154,17 +150,11 @@ type DeleteController struct {
 }
 
 func (this *DeleteController) Get() {
-<<<<<<< HEAD
-	id, _ := strconv.Atoi(this.Ctx.Params[":id"])
-	this.Data["Post"] = models.DelBlog(id)
-	this.Ctx.Redirect(302, "/")
-=======
 	id, _ := strconv.Atoi(this.Ctx.Input.Params[":id"])
 	blog := models.GetBlog(id)
  	this.Data["Post"] = blog
  	models.DelBlog(blog)
  	this.Ctx.Redirect(302, "/")
->>>>>>> eead24cf064976b648de5826eab51880c803b0fa
 }
 ```