Unification of forks & conversion to real children

.gitignore

@@ -1,7 +1,7 @@
 *~
 *.pyc
-xblock_mentoring.egg-info
-workbench.sqlite
-mentoring/templates/xml
-dist
-templates
+/.coverage
+/xblock_mentoring.egg-info
+/workbench.*
+/dist
+/templates

.travis.yml

@@ -0,0 +1,21 @@
+language: python
+python:
+    - "2.7"
+before_install:
+    - "export DISPLAY=:99"
+    - "sh -e /etc/init.d/xvfb start"
+install:
+    - "pip install -e git://github.com/edx/xblock-sdk.git#egg=xblock-sdk"
+    - "pip install -r $VIRTUAL_ENV/src/xblock-sdk/requirements.txt"
+    - "pip install -r $VIRTUAL_ENV/src/xblock-sdk/test-requirements.txt"
+    - "pip install -r requirements.txt"
+    - "pip uninstall -y xblock-mentoring && python setup.py sdist && pip install dist/xblock-mentoring-2.0.tar.gz"
+script:
+    - pep8 mentoring --max-line-length=120
+    - pylint mentoring --disable=all --enable=function-redefined,undefined-variable,unused-variable
+    - python run_tests.py --with-coverage --cover-package=mentoring
+notifications:
+  email: false
+branches:
+    only:
+        - master

AUTHORS

@@ -0,0 +1,11 @@
+Developed by OpenCraft
+http://opencraft.com/
+
+Xavier Antoviaque <xavier@opencraft.com>
+Filippo Valsorda <fv@filippo.io>
+Matjaz Gregoric <matjaz@opencraft.com>
+David Gabor Bodor <david.gabor.bodor@gmail.com>
+Alan Boudreault <boudreault.alan@gmail.com>
+Eugeny Kolpakov <eugeny@opencraft.com>
+Braden MacDonald <braden@opencraft.com>
+Jonathan Piacenti <jonathan@opencraft.com>