Merge pull request #3200 from learningequality/nalanda-rct3

Nalanda rct3 into Central Master
learningequality · Mar 9, 2015 · abb207c · abb207c
2 parents f19a34a + 3bbd98e
commit abb207c
Show file tree

Hide file tree

Showing 68 changed files with 1,796 additions and 1,527 deletions.
diff --git a/.gitignore b/.gitignore
@@ -28,6 +28,7 @@ writeup/
 /content/*.mp4
 /content/*.mp4.part
 /content/*.srt
+/content/khan
 /data/logs
 /data/i18n
 /data/subtitles

diff --git a/README.md b/README.md
@@ -16,6 +16,14 @@
 Official website: http://kalite.learningequality.org/
 
 ---
+
+#### Documentation
+
+* Instructions for installation: [See: INSTALL.md](INSTALL.md)
+* Further documentation: [See: our wiki](https://github.com/learningequality/ka-lite/wiki)
+
+---
+
 #### License information:
 
 The KA Lite sourcecode itself is open-source [MIT licensed](http://opensource.org/licenses/MIT), and the other included software and content is licensed as described in the [LICENSE](https://raw.github.com/learningequality/ka-lite/master/LICENSE) file. Please note that KA Lite is not officially affiliated with, nor maintained by, Khan Academy, but rather makes use of Khan Academy's open API and Creative Commons content, which may only be used for non-commercial purposes.
diff --git a/docs/BIG-IDEAS-DEMO.md b/docs/BIG-IDEAS-DEMO.md
diff --git a/docs/DEVELOPMENT.md b/docs/DEVELOPMENT.md
diff --git a/docs/FRONTEND.md b/docs/FRONTEND.md