Syncing old changes
Merge branch 'master' of git://github.com/nycresistor/Future-Crew

Conflicts:
	consoles/ToyPianoConsole/toypiano.py