Merge branch 'master' of github.com:webnotes/erpnext

.gitignore

@@ -3,3 +3,5 @@
 .DS_Store
 server_tools
 patch.log
+lib
+versions-local.db

README

@@ -1,3 +0,0 @@
-For more info, download, install
-
-http://erpnext.org

README.md

@@ -0,0 +1,30 @@
+# ERPNext - Open Source + SAAS ERP
+
+Includes Accounting, Inventory, CRM, Sales, Purchase, Projects, HRMS
+
+Built on Python / MySQL / wnframework
+
+- [Download](http://erpnext.org)
+- [Use now as SAAS @ $7/user/month](https://erpnext.com)
+
+## Platform
+
+ERPNext is built on [wnframework](https://github.com/webnotes/wnframework)
+
+## Download and Install
+
+For download and install details, please go to [erpnext.org](http://erpnext.org)
+
+## Forums
+
+- [User / Functional](http://groups.google.com/group/erpnext-user-forum)
+- [Technical](http://groups.google.com/group/wnframework)
+
+## Contributing
+
+If you interested in contributing to ERPNext, you must go thorough the wnframework. The code is not easily understandable, but we are making a lot of effort to do it.
+
+## License
+
+ERPNext is available under the GNU/GPL license.
+

config/conf.py

@@ -0,0 +1,7 @@
+index_path = '/'
+
+include_paths = [
+	'erpnext',
+	'lib/py',
+	'lib/py/legacy'
+]