Edit
 Test
Test
Merge branch 'master' of https://github.com/benjaminbacon/BaconProjects

Conflicts:
	README.md

	modified:   README.md
	new file:   mingle.v2
	modified:   SRC/Adafruit-Raspberry-Pi-Python-Code (modified content)
	modified:   SRC/Rpi-hw (untracked content)
	modified:   SRC/WiringPi2-Python (untracked content)
	modified:   SRC/matrixQPi (modified content, untracked content)
	modified:   SRC/wiringPi (untracked content)