resolve merge conflicts

jithinbp · jithinbp · commit 97d4fa8be500 · 2017-06-08T23:27:03.000+05:30
diff --git a/PSL/Peripherals.py b/PSL/Peripherals.py
@@ -384,7 +384,7 @@ def __captureStart__(self,address,location,sample_length,total_samples,tg):
         Blocking call that starts fetching data from I2C sensors like an oscilloscope fetches voltage readings
         You will then have to call `__retrievebuffer__` to fetch this data, and `__dataProcessor` to process and return separate channels
         refer to `capture` if you want a one-stop solution.
-
+        
         .. tabularcolumns:: |p{3cm}|p{11cm}|
         ==================  ============================================================================================
         **Arguments**
diff --git a/README.md b/README.md
@@ -8,17 +8,15 @@ The Pocket Science Lab from FOSSASIA <http://pslab.fossasia.org>
 
 This repository hosts the python library for communicating with PSLab. This can be installed on a linux pc/raspberry pi. With this, one can communicate with the hardware using simple python code. 
 
+The goal of PSLab is to create an Open Source hardware device (open on all layers) that can be used for experiments by teachers, students and citizen scientists. Our tiny pocket lab provides an array of sensors for doing science and engineering experiments. It provides functions of numerous measurement devices including an oscilloscope, a waveform generator, a frequency counter, a programmable voltage, current source and as a data logger. Our website is at: http://pslab.fossasia.org
 
-* The project is inspired from ExpEYES  http://expeyes.in
-* FOSSASIA is supporting development and promotion of ExpEYES project since 2014 mainly through Google Summer of Code
-* The current work is a part of my GSoC-16 project
+### Communication
 
-### Communication Chat: [Pocket Science Slack Channel](http://fossasia.slack.com/messages/pocketscience/) | [Get an Invite](http://fossasia-slack.herokuapp.com/)
+Please join us on the following channels:
+* [Pocket Science Channel](https://gitter.im/fossasia/pslab)
+* [Mailing List](https://groups.google.com/forum/#!forum/pslab-fossasia)
 
-----------------
-
-Installation
-------------
+### Installation
 
 To install PSLab on Debian based Gnu/Linux system, the following dependencies must be installed.
 
