Merge branch 'master' of github.com:NeilNjae/miniband

Conflicts:
	README.md

diff --git a/.gitignore b/.gitignore
new file mode 100644 (file)
index 0000000..d2d6f36
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,35 @@
+*.py[cod]
+
+# C extensions
+*.so
+
+# Packages
+*.egg
+*.egg-info
+dist
+build
+eggs
+parts
+bin
+var
+sdist
+develop-eggs
+.installed.cfg
+lib
+lib64
+
+# Installer logs
+pip-log.txt
+
+# Unit test / coverage reports
+.coverage
+.tox
+nosetests.xml
+
+# Translations
+*.mo
+
+# Mr Developer
+.mr.developer.cfg
+.project
+.pydevproject

diff --git a/README.md b/README.md
index 80b1043530be3e48a65b8e86c554d69a232f79db..f3df51f30db72bee4f66db54eb2bfac843bd8460 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1,4 +1,5 @@
 # Code Club - Mini Band Project
+Updated project for Code Club, using Arduino and Raspberry Pi
 
 <img src="http://farm9.staticflickr.com/8338/8256708023_4a941566e9.jpg" width="500" height="375" alt="photo (2)">
 
@@ -175,4 +176,4 @@ in a separate terminal and watching what the devices were called when we plugged
 
 The Scratch file, music-maker, makes the sounds. It responds to the signals from the Python handler above by playing the appropriate sounds. It also does some visual feedback for the insturments. 
 
-Scratch on the Raspberry Pi is very slow, especially when it comes to updating the screen. Very often, Scratch would hang mid-way through a jamming session, only to start playing all the sounds after a short while. During the demos, people suggested that we minimise the Scratch window to reduce its workload.
\ No newline at end of file
+Scratch on the Raspberry Pi is very slow, especially when it comes to updating the screen. Very often, Scratch would hang mid-way through a jamming session, only to start playing all the sounds after a short while. During the demos, people suggested that we minimise the Scratch window to reduce its workload.