Merge branch 'master' of localhost:xiaoxiao/gogs3

Conflicts:
	.gitignore
	README.md

diff --cc .gitignore
index eab518bb53f83611271c43420c4ebdeabfa6f203,6cd1df2b7a3b5cd99e60d82ef18f486a3ef8d922..cd9109b8db0c8a4c88e2388fc0446cff660f7616
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -1,18 -1,3 +1,21 @@@
++<<<<<<< HEAD
 +
 +
 +gogs
 +*.exe
 +*.exe~
 +.DS_Store
 +*.db
 +*.log
 +custom/
 +data/
 +.vendor/
 +.idea/
 +*.iml
 +public/img/avatar/
 +
++=======
++>>>>>>> b4db9f67548a41922f1b337daf9c9d2b975b55c4
  # Compiled Object files, Static and Dynamic libs (Shared Objects)
  *.o
  *.a

diff --cc README.md
index a39a92a32214f6a5c245c90c9014757ff4520f3e,bc4c051218da4f1d527926cd5a3511a12f2d3e44..aa46fe0b65fb34ceb6372b0f891f5c238724a3ec
--- 1/README.md
--- 2/README.md
+++ b/README.md
@@@ -1,60 -1,4 +1,57 @@@
- Gogs - Go Git Service [![wercker status](https://app.wercker.com/status/ad0bdb0bc450ac6f09bc56b9640a50aa/s/ "wercker status")](https://app.wercker.com/project/bykey/ad0bdb0bc450ac6f09bc56b9640a50aa) [![Build Status](https://drone.io/github.com/gogits/gogs/status.png)](https://drone.io/github.com/gogits/gogs/latest)
- =====================
- 
 -gogs3
 -=====
 +Gogs(Go Git Service) is a Self Hosted Git Service in the Go Programming Language.
  
 -gogs3
 +![Demo](http://gowalker.org/public/gogs_demo.gif)
 +
 +##### Current version: 0.1.7 Alpha
 +
 +#### Other language version
 +
 +- [简体中文](README_ZH.md)
 +
 +## Purpose
 +
 +Since we choose to use pure Go implementation of Git manipulation, Gogs certainly supports **ALL platforms**  that Go supports, including Linux, Mac OS X, and Windows with **ZERO** dependency. 
 +
 +More importantly, Gogs only needs one binary to setup your own project hosting on the fly!
 +
 +## Overview
 +
 +- Please see [Wiki](https://github.com/gogits/gogs/wiki) for project design, develop specification, change log and road map.
 +- See [Trello Broad](https://trello.com/b/uxAoeLUl/gogs-go-git-service) to follow the develop team.
 +- Try it before anything? Do it [online](http://try.gogits.org/Unknown/gogs) or go down to **Installation -> Install from binary** section!
 +- Having troubles? Get help from [Troubleshooting](https://github.com/gogits/gogs/wiki/Troubleshooting).
 +
 +## Features
 +
 +- Activity timeline
 +- SSH/HTTPS protocol support.
 +- Register/delete account.
 +- Create/delete/watch public repository.
 +- User profile page.
 +- Repository viewer.
 +- Gravatar support.
 +- Mail service(register).
 +- Administration panel.
 +- Supports MySQL, PostgreSQL and SQLite3(binary release only).
 +
 +## Installation
 +
 +Make sure you install [Prerequirements](https://github.com/gogits/gogs/wiki/Prerequirements) first.
 +
 +There are two ways to install Gogs:
 +
 +- [Install from binary](https://github.com/gogits/gogs/wiki/Install-from-binary): **STRONGLY RECOMMENDED** for just try and deployment!
 +- [Install from source](https://github.com/gogits/gogs/wiki/Install-from-source)
 +
 +## Acknowledgments
 +
 +- Logo is inspired by [martini-contrib](https://github.com/martini-contrib).
 +- Router and middleware mechanism of [martini](http://martini.codegangsta.io/).
 +- Mail Service, modules design is inspired by [WeTalk](https://github.com/beego/wetalk).
 +- System Monitor Status is inspired by [GoBlog](https://github.com/fuxiaohei/goblog).
 +- Usage and modification from [beego](http://beego.me) modules.
 +- Thanks [gobuild.io](http://gobuild.io) for providing binary compile and download service.
 +
 +## Contributors
 +
- This project was launched by [Unknown](https://github.com/Unknwon) and [lunny](https://github.com/lunny); [fuxiaohei](https://github.com/fuxiaohei) and [slene](https://github.com/slene) joined the team soon after. See [contributors page](https://github.com/gogits/gogs/graphs/contributors) for full list of contributors.
++This project was launched by [Unknown](https://github.com/Unknwon) and [lunny](https://github.com/lunny); [fuxiaohei](https://github.com/fuxiaohei) and [slene](https://github.com/slene) joined the team soon after. See [contributors page](https://github.com/gogits/gogs/graphs/contributors) for full list of contributors.